From ad09d521243d9275d2af99b5aa5b67b9f79d3a77 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Dec 2012 22:34:39 +0100 Subject: write_channel.py rewritten to announce_pubkey announce_pubkey is a shell-only implementation of the now obsolete write_channel script to announce a hosts public key the only dependency of this script is telnet, haven't seen a system without it for a while now --- retiolum/scripts/tinc_setup/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum/scripts/tinc_setup/install.sh') diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index a6b50b8a..2e36b83a 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -73,7 +73,7 @@ if [ ! -e rsa_key.priv ] then echo "creating new keys" tincd -n $netname -K - python ${CURR}/write_channel.py $myname || \ + $MYBIN/announce_pubkey $myname || \ echo "cannot write public key to IRC, you are on your own. Good Luck" else echo "key files already exist, skipping" -- cgit v1.2.3 From cd619766bd3b9a73aa2ee7559f4b3ce0f3ebb8ca Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 13 Jan 2013 18:22:50 +0100 Subject: retiolum install: pass full IPv4 to check-free-retiolum-v4 This fixes a bug, where an unused address (10.243.0.10) could not be used another address (10.9.0.10) has the same suffix. --- retiolum/scripts/tinc_setup/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum/scripts/tinc_setup/install.sh') diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 2e36b83a..ea969f4c 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -45,7 +45,7 @@ then then printf 'select v4 subnet ip (1-255): ' read v4num - until $MYBIN/check-free-retiolum-v4 $v4num; do + until $MYBIN/check-free-retiolum-v4 10.243.0.$v4num; do echo "your're an idiot!" printf 'select unused v4 subnet ip (1-255): ' read v4num -- cgit v1.2.3 From bda7debcae55cba177e4c6fb5eaa70d6360fad32 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 13 Jan 2013 18:32:32 +0100 Subject: retiolum install: replace oxberg,pa_sharepoint by albi10,pigstarter --- retiolum/scripts/tinc_setup/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'retiolum/scripts/tinc_setup/install.sh') diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index ea969f4c..a72d2b8b 100755 --- a/retiolum/scripts/tinc_setup/install.sh +++ b/retiolum/scripts/tinc_setup/install.sh @@ -63,8 +63,8 @@ fi cat>tinc.conf<