From 9d16807a67b40648095b15edf59fb7d601b9b079 Mon Sep 17 00:00:00 2001
From: tv <tv@xso>
Date: Fri, 9 Sep 2011 15:55:05 +0200
Subject: //retiolum/bin/hosts: use BRE @sed

---
 retiolum/bin/hosts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'retiolum')

diff --git a/retiolum/bin/hosts b/retiolum/bin/hosts
index 6939f52c..bd0c77dc 100755
--- a/retiolum/bin/hosts
+++ b/retiolum/bin/hosts
@@ -6,6 +6,8 @@ netname=${1-retiolum}
 cd /etc/tinc/$netname/hosts
 
 for i in `ls`; do
-  sed -rn 's|^ *Subnet *= *([^ /]*)(/[0-9]*)? *$|\1\t'$i' '$i'.'$netname'|p' $i
+  sed -n '
+    s|^ *Subnet *= *\([^ /]*\)\(/[0-9]*\)\? *$|\1\t'$i' '$i'.'$netname'|p
+  ' $i
 done | sort
 
-- 
cgit v1.2.3


From ee02a8c3dea925f568e58aebeb3e01a52ba21ef8 Mon Sep 17 00:00:00 2001
From: tv <tv@xso>
Date: Fri, 9 Sep 2011 16:12:44 +0200
Subject: //retiolum/bin/ipv6: use BRE @sed

---
 retiolum/bin/ipv6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'retiolum')

diff --git a/retiolum/bin/ipv6 b/retiolum/bin/ipv6
index 65a1eaa1..34c6de71 100755
--- a/retiolum/bin/ipv6
+++ b/retiolum/bin/ipv6
@@ -13,7 +13,7 @@ if test `id -u` != 0; then
 fi
 
 file=/etc/tinc/retiolum/hosts/`hostname`
-addr=`sed -rn 's|^Subnet *= *(42:[0-9A-Fa-f:]*/128)|\1|p' $file`
+addr=`sed -n 's|^Subnet *= *\(42:[0-9A-Fa-f:]*/128\)|\1|p' $file`
 route=42::/16
 
 start() {
-- 
cgit v1.2.3


From a6521f5755d80ca09be88ca2f719fab526a88b43 Mon Sep 17 00:00:00 2001
From: tv <tv@xso>
Date: Fri, 9 Sep 2011 16:14:15 +0200
Subject: //retiolum/scripts/tinc_setup/tinc-up: use BRE @sed

---
 retiolum/scripts/tinc_setup/tinc-up | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'retiolum')

diff --git a/retiolum/scripts/tinc_setup/tinc-up b/retiolum/scripts/tinc_setup/tinc-up
index ae7c68e6..9a557787 100755
--- a/retiolum/scripts/tinc_setup/tinc-up
+++ b/retiolum/scripts/tinc_setup/tinc-up
@@ -4,15 +4,15 @@ dirname="`dirname "$0"`"
 
 conf=$dirname/tinc.conf
 
-name=`sed -rn 's|^ *Name *= *([^ ]*) *$|\1|p' $conf`
+name=`sed -n 's|^ *Name *= *\([^ ]*\) *$|\1|p' $conf`
 
 host=$dirname/hosts/$name
 
 route4=10.7.7.0/24
-addr4=`sed -rn 's|^ *Subnet *= *(10\.[^ ]*) *$|\1|p' $host`
+addr4=`sed -n 's|^ *Subnet *= *\(10\.[^ ]*\) *$|\1|p' $host`
 
 route6=42::/16
-addr6=`sed -rn 's|^ *Subnet *= *(42:[^ ]*) *$|\1|p' $host`
+addr6=`sed -n 's|^ *Subnet *= *\(42:[^ ]*\) *$|\1|p' $host`
 
 ifconfig $INTERFACE up $addr4
 route add -net $route4 dev $INTERFACE
-- 
cgit v1.2.3


From bd44e393c7fcc5d2f92a99a2d6b52f1815ebdb84 Mon Sep 17 00:00:00 2001
From: tv <tv@xso>
Date: Fri, 9 Sep 2011 16:44:11 +0200
Subject: //retiolum/bin/update_tinc_hosts: sed -i is evil, too

---
 retiolum/bin/update_tinc_hosts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'retiolum')

diff --git a/retiolum/bin/update_tinc_hosts b/retiolum/bin/update_tinc_hosts
index fe0785e3..8cdc3beb 100755
--- a/retiolum/bin/update_tinc_hosts
+++ b/retiolum/bin/update_tinc_hosts
@@ -31,7 +31,10 @@ case "${*-I am made of stupid}" in
     $0 has magic || $0 print magic >> $hosts < /dev/null
     ;;
   ('destroy magic')
-    $0 has magic && sed -ie "/^$bs$/,/^$es$/d" $hosts 
+    if $0 has magic; then
+      cache="`cat $hosts`"
+      echo "$cache" | sed "/^$bs$/,/^$es$/d" > $hosts 
+    fi
     ;;
   ('has magic')
     grep -q "^$bs$" $hosts && grep -q "^$es$" $hosts
-- 
cgit v1.2.3


From 1bc1b54e445f2d48d8f4c2080240a0f4e94d0c96 Mon Sep 17 00:00:00 2001
From: tv <tv@xso>
Date: Fri, 9 Sep 2011 16:45:54 +0200
Subject: //retiolum/bin/update_tinc_hosts: create magic implies [re]start

---
 retiolum/bin/update_tinc_hosts | 1 +
 1 file changed, 1 insertion(+)

(limited to 'retiolum')

diff --git a/retiolum/bin/update_tinc_hosts b/retiolum/bin/update_tinc_hosts
index 8cdc3beb..86a28992 100755
--- a/retiolum/bin/update_tinc_hosts
+++ b/retiolum/bin/update_tinc_hosts
@@ -29,6 +29,7 @@ case "${*-I am made of stupid}" in
     ;;
   ('create magic')
     $0 has magic || $0 print magic >> $hosts < /dev/null
+    $0 start
     ;;
   ('destroy magic')
     if $0 has magic; then
-- 
cgit v1.2.3


From d5ab191b88cfd211ce39e4226df10616b25af179 Mon Sep 17 00:00:00 2001
From: tv <tv@xso>
Date: Fri, 9 Sep 2011 17:50:19 +0200
Subject: //retiolum/hosts/sir_krebs_a_lot: initial commit

---
 retiolum/hosts/sir_krebs_a_lot | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 retiolum/hosts/sir_krebs_a_lot

(limited to 'retiolum')

diff --git a/retiolum/hosts/sir_krebs_a_lot b/retiolum/hosts/sir_krebs_a_lot
new file mode 100644
index 00000000..14e9d242
--- /dev/null
+++ b/retiolum/hosts/sir_krebs_a_lot
@@ -0,0 +1,11 @@
+Address = 84.23.79.81
+Subnet = 10.7.7.100
+Subnet = 42:48bd:f4cd:b2f1:ff6b:865c:d041:def6/128
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAzkVF0BSWUEqzdUidLTa6qL4wlNSb8gaxyZperzoAj65d5l25SCqc
+jjqvREcE6p+jM4t1STXoohnNvexubNXW3PVo5Zpew+BsaGjVvow0LkqCJ9k96Rrk
+JzU5lAVH6om3/QYws/Ot0zq1Z/+Xw/0+9JpVKhEipMWLpLgjAvWdvzSW6aBIHVN1
+3E85fkTE5f0azct+XNSNzUebdyIy8wu/EexGmFI9bN+ewIvqjZJdvxP+Ank55MsE
+8P7K9TKwVXw440MGqqoQaOhdaT75TL+2nsAfWYcrNnE3YehMOmCMp9oY+RAvsIkK
+iAYyF5l7ZTi/7KGHNsG7rr0cbytiz2nS6wIDAQAB
+-----END RSA PUBLIC KEY-----
-- 
cgit v1.2.3