From d3bb83f9bacb360b2793f40ab4ef46486b689702 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 04:05:48 +0100 Subject: dn42: lets get the party started --- retiolum/hosts/slowpoke | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/slowpoke b/retiolum/hosts/slowpoke index 09e415e1..27b1e57c 100644 --- a/retiolum/hosts/slowpoke +++ b/retiolum/hosts/slowpoke @@ -1,6 +1,7 @@ Address = 62.113.241.235 Subnet = 10.243.232.121 Subnet = 42:7d8f:9e3a:dcc7:9b22:d1ca:7e28:fe9c +Subnet = 172.22.0.0/15 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA9EtaOHLa0CyOGpX3rzMLqi9HqrjzVe3XdSfcb9QPYwcbxpPYNLLk -- cgit v1.2.3 From fd1144b06d602581270a310d9e15476c07873335 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 13:43:45 +0100 Subject: retiolum: updated build scripts --- retiolum/Makefile | 2 -- retiolum/scripts/tinc_setup/tinc-up | 11 +++-------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/retiolum/Makefile b/retiolum/Makefile index b3a3c124..950099f4 100755 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -9,8 +9,6 @@ links: install: upgrade - ../punani/bin/punani install tinc python - scripts/tinc_setup/install.sh sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up upgrade: update diff --git a/retiolum/scripts/tinc_setup/tinc-up b/retiolum/scripts/tinc_setup/tinc-up index a829528d..043e1e46 100755 --- a/retiolum/scripts/tinc_setup/tinc-up +++ b/retiolum/scripts/tinc_setup/tinc-up @@ -11,14 +11,9 @@ host=$dirname/hosts/$name ip link set $INTERFACE up addr4=`sed -n 's|^ *Subnet *= *\(10[.][^ ]*\) *$|\1|p' $host` -if [ "$addr4" != '' ];then - ip -4 addr add $addr4 dev $INTERFACE - ip -4 route add 10.243.0.0/16 dev $INTERFACE -else - addr4=`sed -n 's|^ *Subnet *= *\(42[.][^ ]*\) *$|\1|p' $host` - ip -4 addr add $addr4 dev $INTERFACE - ip -4 route add 42.0.0.0/16 dev $INTERFACE -fi +ip -4 addr add $addr4 dev $INTERFACE +ip -4 route add 10.243.0.0/16 dev $INTERFACE +ip -4 route add 172.22.0.0/15 dev $INTERFACE addr6=`sed -n 's|^ *Subnet *= *\(42[:][^ ]*\) *$|\1|p' $host` ip -6 addr add $addr6 dev $INTERFACE -- cgit v1.2.3 From e4328ccb256639a66bcedc30c80f89d4f5b342a2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 13:46:23 +0100 Subject: tinc-setup: new route in tinc-up --- retiolum/scripts/tinc_setup/new_install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 1ebde38b..50fbc3b5 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -218,6 +218,8 @@ EOF echo "addr4=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET4[.][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up echo 'ip -4 addr add $addr4 dev $INTERFACE' >> tinc-up echo "ip -4 route add $FULLSUBNET/$MASK4 dev \$INTERFACE" >> tinc-up + #TODO: variable for network announced + echo "ip -4 route add 172.22.0.0/15 dev \$INTERFACE" >> tinc-up echo '' >> tinc-up echo "addr6=\$(sed -n \"s|^ *Subnet *= *\\($SUBNET6[:][^ ]*\\) *\$|\\\\1|p\" \$host)" >> tinc-up echo 'ip -6 addr add $addr6 dev $INTERFACE' >> tinc-up -- cgit v1.2.3 From 7a2b01d9607942d9df076a2e354cefe97d5fc49a Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 13:49:39 +0100 Subject: retiolum: only 1 restart method required --- retiolum/Makefile | 2 +- retiolum/bin/restart-tincd | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100755 retiolum/bin/restart-tincd diff --git a/retiolum/Makefile b/retiolum/Makefile index 950099f4..40c5eacc 100755 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -14,7 +14,7 @@ install: upgrade upgrade: update if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \ - sudo bin/restart-tincd || :; \ + sudo pkill -HUP tincd || :; fi update: hosts diff --git a/retiolum/bin/restart-tincd b/retiolum/bin/restart-tincd deleted file mode 100755 index 17d939d9..00000000 --- a/retiolum/bin/restart-tincd +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/sh -set -xeuf - -PATH="$(dirname $(readlink -f "$0"))${PATH+:$PATH}" - -if args="`pgrep-retiolum-tincd-args`"; then - while $args --kill; do - sleep 1 - done - $args -else - echo "$0: there is no retiolum tincd process to restart" >&2 - exit 23 -fi -- cgit v1.2.3 From 2b1b6a2917c7590e4aa7615beba93789a44106a9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 13:57:44 +0100 Subject: removed pgrep-retiolum-tincd-args --- retiolum/bin/pgrep-retiolum-tincd-args | 2 -- 1 file changed, 2 deletions(-) delete mode 100755 retiolum/bin/pgrep-retiolum-tincd-args diff --git a/retiolum/bin/pgrep-retiolum-tincd-args b/retiolum/bin/pgrep-retiolum-tincd-args deleted file mode 100755 index 19c05fbe..00000000 --- a/retiolum/bin/pgrep-retiolum-tincd-args +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -ps -e -o args | grep -E '(^|[ /])tincd +([^ ].* )?(-n +|--net=)retiolum' -- cgit v1.2.3 From 6c2a83b5b18f6f59431897408ff4e3ab81dc247c Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 14:43:22 +0100 Subject: retiolium/wall: new external ip --- retiolum/hosts/wall | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/wall b/retiolum/hosts/wall index 9cedb8dd..facd03c4 100644 --- a/retiolum/hosts/wall +++ b/retiolum/hosts/wall @@ -1,3 +1,4 @@ +Address = 176.9.48.250 Subnet = 10.243.248.11 Subnet = 42:e1b6:4748:b0cf:555c:bdfe:26de:3a9d -- cgit v1.2.3 From 40cc6d787653c7b159688021b08420ac50c766ad Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 16:08:22 +0100 Subject: retiolum: Makefile fix typo --- retiolum/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/Makefile b/retiolum/Makefile index 40c5eacc..feb89f73 100755 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -14,7 +14,7 @@ install: upgrade upgrade: update if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \ - sudo pkill -HUP tincd || :; + sudo pkill -HUP tincd || :; \ fi update: hosts -- cgit v1.2.3 From e8d5b4968a6625d29329d3baa23cb76e2fccc2c9 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 17:09:14 +0100 Subject: retiolum: add thomasDOTde from ccc13 --- retiolum/hosts/thomasDOTde | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 retiolum/hosts/thomasDOTde diff --git a/retiolum/hosts/thomasDOTde b/retiolum/hosts/thomasDOTde new file mode 100644 index 00000000..4baac6f8 --- /dev/null +++ b/retiolum/hosts/thomasDOTde @@ -0,0 +1,9 @@ +Subnet = 10.243.42.23/32 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA3btaQpK89aRDJ66cW8H9RlDIzr4k4WIGiqNCsIAE5MhSGCtjboWO +elgRWlYP59l54yRzn5FpvABAWeRupbX/AMhG8IiBgU6438+F2kVlZdJM4DP51F7c +N2Ek2WKSoIJuiv7Aqb1WlHIWlN3ehg/BXcFPLSav+iChWXAD+MkKmMwL8lGEzsus +MdbpRLxB0g90FUmpwr2f8euanOXYhU6sjnxH+0JY+j9AwWQLfAqtQ1eGO5MK75Dw +htPM3Pj90bkfnYNjNXvnyjsQScDjYG/cv/zDwqRQWNcsmT3EqsBnmM5q0EL+Djo1 +lsPTacJdRtHsnQne9daNadnHywQPX+t/QwIDAQAB +-----END RSA PUBLIC KEY---- -- cgit v1.2.3 From 80780e4ddd977deda4846f0c10da3ef94f6c12ba Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 17:19:01 +0100 Subject: retiolum: fixed hosts typo --- retiolum/hosts/thomasDOTde | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/hosts/thomasDOTde b/retiolum/hosts/thomasDOTde index 4baac6f8..ce47b39e 100644 --- a/retiolum/hosts/thomasDOTde +++ b/retiolum/hosts/thomasDOTde @@ -6,4 +6,4 @@ N2Ek2WKSoIJuiv7Aqb1WlHIWlN3ehg/BXcFPLSav+iChWXAD+MkKmMwL8lGEzsus MdbpRLxB0g90FUmpwr2f8euanOXYhU6sjnxH+0JY+j9AwWQLfAqtQ1eGO5MK75Dw htPM3Pj90bkfnYNjNXvnyjsQScDjYG/cv/zDwqRQWNcsmT3EqsBnmM5q0EL+Djo1 lsPTacJdRtHsnQne9daNadnHywQPX+t/QwIDAQAB ------END RSA PUBLIC KEY---- +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 5178269e0347c9e252245df77b7daf4946774166 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 17:23:58 +0100 Subject: doku: tinc on windows --- cholerab/tinc-win | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 cholerab/tinc-win diff --git a/cholerab/tinc-win b/cholerab/tinc-win new file mode 100644 index 00000000..80076d06 --- /dev/null +++ b/cholerab/tinc-win @@ -0,0 +1,7 @@ +install tinc in windows +add tap device +Interface instead of device in tinc.conf +fix ip in windows network device +generate key +propagate hosts + -- cgit v1.2.3 From bda622d608dc7a713e27b8ac23d6bb69fcc2649d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 17:34:52 +0100 Subject: retiolum: new host elivis for dn42 peering --- retiolum/hosts/elvis | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 retiolum/hosts/elvis diff --git a/retiolum/hosts/elvis b/retiolum/hosts/elvis new file mode 100644 index 00000000..f78243a3 --- /dev/null +++ b/retiolum/hosts/elvis @@ -0,0 +1,12 @@ +Address = dn42.wg1337.de +Subnet = 10.243.228.181 +Subnet = 42:42a3:7ad4:f156:906f:f6f3:943b:7b1d + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAv7wpfzpazvXzKJsDkJ8J9zsTZRoI6LnpSIcO8hLQcHNk6LTWjBy1 +xdnsSe3eQYxNmZPKi28PdbMo4YQlFdewLSB69PP6ZX5ISNXVlCZ5Cend/kfU1fXV +tcZ4JQCl/adHqg8niLAODfnXhwVjMpllgq6gCg5mVPILy+CZ08OM6Ij7Q5d+3Jr4 +1zMvAXyeuNQcL+MkBveblKC6j/e9fqaK86sUh/4unfgmkB7GWjqFwmoHZepR83o9 +HTBmKxEIDKYjLWVXV1Wph3/JN/65igTtju26cVarUmTtGIhU44NzCi+94+wKuJMU +Bbjk/CnuWQoU2ABPsxtW3r6m4pSDhypNZQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From e7132b290465eeef89c46ab91bb3deda076de215 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 29 Dec 2013 17:42:49 +0100 Subject: add flap flap is a cloudatcost vhost --- retiolum/hosts/flap | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/flap diff --git a/retiolum/hosts/flap b/retiolum/hosts/flap new file mode 100644 index 00000000..ea6aace5 --- /dev/null +++ b/retiolum/hosts/flap @@ -0,0 +1,11 @@ +Subnet = 10.243.211.172 +Subnet = 42:472a:3d01:bbe4:4425:567e:592b:065d + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwtLD+sgTQGO+eh2Ipq2r54J1I0byvfkaTBeBwhtUmWst+lUQUoGy +2fGReRYsb4ThDLeyK439jZuQBeXSc5r2g0IHBJCSWj3pVxc1HRTa8LASY7QuprQM +8rSQa2XUtx/KpfM2eVX0yIvLuPTxBoOf/AwklIf+NmL7WCfN7sfZssoakD5a1LGn +3EtZ2M/4GyoXJy34+B8v7LugeClnW3WDqUBZnNfUnsNWvoldMucxsl4fAhvEehrL +hGgQMjHFOdKaLyatZOx6Pq4jAna+kiJoq3mVDsB4rcjLuz8XkAUZmVpe5fXAG4hr +Ig8l/SI6ilu0zCWNSJ/v3wUzksm0P9AJkwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From c0ce0ad9d26978ff84516281fa20ca5b1cf3adfe Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 18:19:49 +0100 Subject: retiolum: sudo for diff --- retiolum/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/retiolum/Makefile b/retiolum/Makefile index feb89f73..7942b77c 100755 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -12,7 +12,7 @@ install: upgrade sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up upgrade: update - if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ + if ! sudo diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \ sudo pkill -HUP tincd || :; \ fi -- cgit v1.2.3 From 75f19c77fb0e59e8298b784cdeaceb8cc3bd4931 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 29 Dec 2013 19:24:27 +0100 Subject: retiolum: wall dn42 ip range --- retiolum/hosts/wall | 1 + 1 file changed, 1 insertion(+) diff --git a/retiolum/hosts/wall b/retiolum/hosts/wall index facd03c4..60dc6dc6 100644 --- a/retiolum/hosts/wall +++ b/retiolum/hosts/wall @@ -1,6 +1,7 @@ Address = 176.9.48.250 Subnet = 10.243.248.11 Subnet = 42:e1b6:4748:b0cf:555c:bdfe:26de:3a9d +Subnet = 172.22.0.0/15 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEApKt/lYqRgl4KE1ouSi5nbt7n7FEjECkGtkRhLFDJs0uWNvPj7wEh -- cgit v1.2.3