From 530ae97550d6ac60f562d8b585a9c39cb6b7d954 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 9 Oct 2011 02:12:28 +0200 Subject: //retiolum hosts ach: initial commit --- retiolum/hosts/ach | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/ach (limited to 'retiolum') diff --git a/retiolum/hosts/ach b/retiolum/hosts/ach new file mode 100644 index 00000000..58e43a0a --- /dev/null +++ b/retiolum/hosts/ach @@ -0,0 +1,11 @@ +Subnet = 10.7.7.67 +Subnet = 42:c50f:d371:cf01:8cf0:0b77:bb01:5013/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA2d5RaWiFmkuw0UhPsQCrFBNNgBwzHQMDO69rU6XlH8VSGI8HTPuI +v5Jjyhrf2p/ktLAnafBUHO32bNRu/9lbM0rjPZna5t1MjJpUaja6yF5TzdAQ4YMD +KTkGqjI9QEuGBPixFNRq+P9QK5FLx1/wtF0ZE1CYS+A6iwQ9S+IPCIYYswUmhYQF +ik2IaixG6EkZj2NSJqvDF4HDJz8lnwQIQfFqZ8WdP2MtMUng09PdjQHss0jqRbPO +4J7UpDkrXSABjDnEYk4CKH0YhLGPB3VDYeD4rQjKuDTYOWXQ8OYIyPVucKe2RABc +dJF6MQ+z+2m1vMqEYPBOH69Ggncq9GQ4xwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 1c1d0d95b3c64d045146a61f12d59183f4cf1cba Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 11 Oct 2011 15:15:00 +0200 Subject: punani: fix multi-match for packages like python using the full path now in retiolum using fallback for different ose --- retiolum/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/Makefile b/retiolum/Makefile index c80a6faa..dd6d8409 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -11,7 +11,7 @@ hosts: bin/update-retiolum-hosts || true install: update - @#punani -Ei tinc python + punani -Eih tinc /usr/bin/python /usr/bin/python2 @# will not run automatically scripts/tinc_setup/install.sh scripts/autostart/create-startup.sh -- cgit v1.2.3 From ec7f80e6954cc00b6fc87c1d35be269b40868e46 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 11 Oct 2011 15:55:51 +0200 Subject: fix bug in install script, change channel --- retiolum/scripts/tinc_setup/install.sh | 1 + retiolum/scripts/tinc_setup/write_channel.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 547cf366..16b0f33d 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -40,6 +40,7 @@ then if ! $MYBIN/check-free-retiolum-v4 $v4num;then exit 1 fi + myipv4="10.7.7.$v4num" fi echo "Subnet = $myipv4" > hosts/$myname diff --git a/retiolum/scripts/tinc_setup/write_channel.py b/retiolum/scripts/tinc_setup/write_channel.py index ee28674f..53a155d9 100644 --- a/retiolum/scripts/tinc_setup/write_channel.py +++ b/retiolum/scripts/tinc_setup/write_channel.py @@ -6,7 +6,7 @@ except: print "you are made of stupid" exit (23) -CHANNEL = '#tincspasm' +CHANNEL = '#krebsco' HOST='irc.freenode.net' FILE="/etc/tinc/retiolum/hosts/"+myname PORT=6667 -- cgit v1.2.3 From 936188129490ef41612343015c24af28be78c76d Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 11 Oct 2011 16:00:17 +0200 Subject: add kremu the krebs emulation node --- retiolum/hosts/kremu | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/kremu (limited to 'retiolum') diff --git a/retiolum/hosts/kremu b/retiolum/hosts/kremu new file mode 100644 index 00000000..06df489f --- /dev/null +++ b/retiolum/hosts/kremu @@ -0,0 +1,10 @@ +Subnet = 42:88ec:8968:cc6b:978a:68b7:1004:fc8a/128 +Subnet = 10.7.7.192 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsdjqCyLvGfkIsawGji1CIIxGaKKdFhKJcfFK8FWiyQdgeNK/9UAh +XsJYkSHVcXqHAorP1QAvk5fIiSEEoSwoChyecqpNOREOnN8+N8RVrs0QIwL0mwa0 +9H4HDcpt8O8J0mpM8z8pb7vhDk261oMchG52TVYX4cuEgpEiyJtij27UIfOeVY8g +8kuJQG+9X7WNGMOt2Y8A7pXFf/+8qdwpOq5C0SIRPR5WplBeeF3BepzmUeq24XOE +cdF/ggYeU8hSYzr3DFX7g9u/gOjBQrhApopx6LR9TkpkrFfVcgLw3NaOzI2vQzqa +7m8v62D+/3vun3ZB/1OfQpIMfm77DC8AEQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From bb5d1bd1f1c0fe22d3b93a5bf17033265ee42776 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Tue, 11 Oct 2011 16:03:56 +0200 Subject: retiolum:add tincd reload after update --- retiolum/Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'retiolum') diff --git a/retiolum/Makefile b/retiolum/Makefile index dd6d8409..bd3ca776 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -21,6 +21,8 @@ update: hosts bin/update_tinc_hosts "create magic" || true @echo adding hosts bin/update_tinc_hosts restart + @echo reloading tincd + pkill -HUP tincd arch-install: update install arch-autostart autohosts -- cgit v1.2.3 From 2d6bd675297ae0952af4905a19abdf2e4b22f91c Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 12 Oct 2011 09:52:34 +0200 Subject: //retiolum/Makefile: fix race condition bug when reloading tincd it might be possible the tincd is not running and therefore pkill returns =! 0 in this case --- retiolum/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/Makefile b/retiolum/Makefile index bd3ca776..83c4ac12 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -22,7 +22,7 @@ update: hosts @echo adding hosts bin/update_tinc_hosts restart @echo reloading tincd - pkill -HUP tincd + pkill -HUP tincd || true arch-install: update install arch-autostart autohosts -- cgit v1.2.3 From b98df3f1e4dabc2d42066be097518f200b5af322 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 12 Oct 2011 10:47:27 +0200 Subject: //retiolum hosts oxberg: initial commit --- retiolum/hosts/oxberg | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/oxberg (limited to 'retiolum') diff --git a/retiolum/hosts/oxberg b/retiolum/hosts/oxberg new file mode 100644 index 00000000..91f0151a --- /dev/null +++ b/retiolum/hosts/oxberg @@ -0,0 +1,11 @@ +Address = 84.23.80.172 +Subnet = 10.7.7.172 +Subnet = 42:c154:3219:a91c:77eb:91bb:2f18:ff75/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA57j66efrYrB7jlBVu6XD6433n/j1QL86KI/l7BCVTE11mJrElElc +YSAOB44arnFurSlU8RZIZAC4gnScmDnjJqCqudxps4wO0JTPqUCvUXkaZQ1fUf7W +H00K05Jkrr6xFHyDwZNrU4uitBfMuAXlUE2A0sFLJiBmFLMSS0abaUg0ALRwFsMI +5ftLHZPMV/TwUollCHQTfwMiMGo28WBm+nYvY+nUZRu3sx8HPLskYWmvt9giu7eo +iQCDee/bHym5Ax9vETpCrkZITq2MJtQdJX46iwvlgKxsV7VkCXAtmU3lMLyTSeRX +582RdmjFP2DdTPEulbL2YyfXVuLs0QIiRQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From e8923cc1ce69716b192e317cb4d5b9e8f0de4e68 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 12 Oct 2011 10:53:15 +0200 Subject: //retiolum install: add oxberg in `sort`ed order --- retiolum/scripts/tinc_setup/install.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 16b0f33d..a550a068 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -54,10 +54,11 @@ cp $CURR/tinc-up /etc/tinc/$netname/ cat>tinc.conf< Date: Wed, 12 Oct 2011 12:56:10 +0200 Subject: //retiolum supernode-update-hosts-and-hup: init --- retiolum/bin/supernode-update-hosts-and-hup | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100755 retiolum/bin/supernode-update-hosts-and-hup (limited to 'retiolum') diff --git a/retiolum/bin/supernode-update-hosts-and-hup b/retiolum/bin/supernode-update-hosts-and-hup new file mode 100755 index 00000000..deff9f2f --- /dev/null +++ b/retiolum/bin/supernode-update-hosts-and-hup @@ -0,0 +1,33 @@ +#! /bin/sh +set -euf + +cd /etc/tinc/retiolum/hosts + +painload="$(dirname "$(readlink -f "$0")")/../.." + +temp1="`mktemp`" +temp2="`mktemp`" +trap "rm -f $temp1 $temp2" EXIT INT TERM + +old_commit="`cat .commit 2>/dev/null || :`" + +curl -fsS "https://github.com/krebscode/painload/tree/master/retiolum/hosts" | + "$painload/util/bin/hrefs" | + grep '^/krebscode/painload/blob/' | + grep -v "/blob/$old_commit/" >$temp1 + +new_commit=`sed 's|^/krebscode/painload/blob/\([^/]*\)/.*|\1|;q' $temp1` + +sed ' + s|^/krebscode/painload/blob/[^/]*/retiolum/hosts/\([^/]*\)$|\1| +' $temp1 > $temp2 + +xargs rm -v -f <$temp2 + +sed " + s|^.*$|https://raw.github.com/krebscode/painload/$new_commit/retiolum/hosts/&| +" $temp2 > $temp1 + +wget -qi- < $temp1 + +echo $new_commit > .commit -- cgit v1.2.3 From 9c2721f58f6ec9c271dd16f2bf0ddc054f24f403 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 12 Oct 2011 12:58:20 +0200 Subject: //retiolum supernode-...: do the HUP! --- retiolum/bin/supernode-update-hosts-and-hup | 2 ++ 1 file changed, 2 insertions(+) (limited to 'retiolum') diff --git a/retiolum/bin/supernode-update-hosts-and-hup b/retiolum/bin/supernode-update-hosts-and-hup index deff9f2f..b1ce3489 100755 --- a/retiolum/bin/supernode-update-hosts-and-hup +++ b/retiolum/bin/supernode-update-hosts-and-hup @@ -31,3 +31,5 @@ sed " wget -qi- < $temp1 echo $new_commit > .commit + +pkill -HUP tincd -- cgit v1.2.3 From 8b1827f42d3d8a967b9a385bbb048835e1792872 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 12 Oct 2011 13:00:44 +0200 Subject: //retiolum super-...: inline hrefs --- retiolum/bin/supernode-update-hosts-and-hup | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'retiolum') diff --git a/retiolum/bin/supernode-update-hosts-and-hup b/retiolum/bin/supernode-update-hosts-and-hup index b1ce3489..221a7538 100755 --- a/retiolum/bin/supernode-update-hosts-and-hup +++ b/retiolum/bin/supernode-update-hosts-and-hup @@ -3,16 +3,18 @@ set -euf cd /etc/tinc/retiolum/hosts -painload="$(dirname "$(readlink -f "$0")")/../.." - temp1="`mktemp`" temp2="`mktemp`" trap "rm -f $temp1 $temp2" EXIT INT TERM old_commit="`cat .commit 2>/dev/null || :`" +_hrefs() { + sed -n 's/href="\([^"]\+\)"/\n&\n/gp' | + sed -n 's/^href="\([^"]\+\)"$/\1/p'; } + curl -fsS "https://github.com/krebscode/painload/tree/master/retiolum/hosts" | - "$painload/util/bin/hrefs" | + _hrefs | grep '^/krebscode/painload/blob/' | grep -v "/blob/$old_commit/" >$temp1 -- cgit v1.2.3 From 979a90b5e238d3bdfea16599d93128cfd1475bc4 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 12 Oct 2011 13:05:07 +0200 Subject: //retiolum supernode-...: add little doc --- retiolum/bin/supernode-update-hosts-and-hup | 30 +++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'retiolum') diff --git a/retiolum/bin/supernode-update-hosts-and-hup b/retiolum/bin/supernode-update-hosts-and-hup index 221a7538..bfba6409 100755 --- a/retiolum/bin/supernode-update-hosts-and-hup +++ b/retiolum/bin/supernode-update-hosts-and-hup @@ -1,4 +1,8 @@ #! /bin/sh +# +# @oxberg we do put this into crontab: +# * * * * * /supernode-update-hosts-and-hup +# set -euf cd /etc/tinc/retiolum/hosts @@ -13,25 +17,27 @@ _hrefs() { sed -n 's/href="\([^"]\+\)"/\n&\n/gp' | sed -n 's/^href="\([^"]\+\)"$/\1/p'; } -curl -fsS "https://github.com/krebscode/painload/tree/master/retiolum/hosts" | +if curl -fsS \ + "https://github.com/krebscode/painload/tree/master/retiolum/hosts" | _hrefs | grep '^/krebscode/painload/blob/' | grep -v "/blob/$old_commit/" >$temp1 -new_commit=`sed 's|^/krebscode/painload/blob/\([^/]*\)/.*|\1|;q' $temp1` + new_commit=`sed 's|^/krebscode/painload/blob/\([^/]*\)/.*|\1|;q' $temp1` -sed ' - s|^/krebscode/painload/blob/[^/]*/retiolum/hosts/\([^/]*\)$|\1| -' $temp1 > $temp2 + sed ' + s|^/krebscode/painload/blob/[^/]*/retiolum/hosts/\([^/]*\)$|\1| + ' $temp1 > $temp2 -xargs rm -v -f <$temp2 + xargs rm -v -f <$temp2 -sed " - s|^.*$|https://raw.github.com/krebscode/painload/$new_commit/retiolum/hosts/&| -" $temp2 > $temp1 + sed " + s|^.*$|https://raw.github.com/krebscode/painload/$new_commit/retiolum/hosts/&| + " $temp2 > $temp1 -wget -qi- < $temp1 + wget -qi- < $temp1 -echo $new_commit > .commit + echo $new_commit > .commit -pkill -HUP tincd + pkill -HUP tincd +fi -- cgit v1.2.3 From 1cff2a9d548336ddcd8a2d732ed2cd348c8e6b79 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 12 Oct 2011 13:08:29 +0200 Subject: //retiolum supernode-...: fix typo --- retiolum/bin/supernode-update-hosts-and-hup | 1 + 1 file changed, 1 insertion(+) (limited to 'retiolum') diff --git a/retiolum/bin/supernode-update-hosts-and-hup b/retiolum/bin/supernode-update-hosts-and-hup index bfba6409..b6b03c69 100755 --- a/retiolum/bin/supernode-update-hosts-and-hup +++ b/retiolum/bin/supernode-update-hosts-and-hup @@ -22,6 +22,7 @@ if curl -fsS \ _hrefs | grep '^/krebscode/painload/blob/' | grep -v "/blob/$old_commit/" >$temp1 +then new_commit=`sed 's|^/krebscode/painload/blob/\([^/]*\)/.*|\1|;q' $temp1` -- cgit v1.2.3