diff options
| author | makefu <root@pigstarter.de> | 2013-01-14 00:50:15 +0000 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2013-01-14 00:50:15 +0000 |
| commit | a2195f3c9f382acebcf49b3043944f34609e4550 (patch) | |
| tree | c542ab73193cd81ecd6482806c05b2fb6560cdae /retiolum/scripts | |
| parent | b6144a1e1b24a82d479741edd12fa3ad7a744c58 (diff) | |
| parent | abf9916bc1add17888308877fa4eb9da330297ef (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
Diffstat (limited to 'retiolum/scripts')
| -rwxr-xr-x | retiolum/scripts/tinc_setup/install.sh | 6 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh index 2e36b83a..a72d2b8b 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 @@ -63,8 +63,8 @@ fi cat>tinc.conf<<EOF Name = $myname ConnectTo = euer -ConnectTo = oxberg -ConnectTo = pa_sharepoint +ConnectTo = albi10 +ConnectTo = pigstarter ConnectTo = supernode Device = /dev/net/tun EOF diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 410dce62..85a61be8 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -402,3 +402,6 @@ NICK="${HOSTN}_$(head /dev/urandom | tr -dc "0123456789" | head -c3)" sed "s/^\(.*\)/PRIVMSG $IRCCHANNEL : \1/" hosts/$HOSTN; sleep 5; ) | telnet $IRCSERVER $IRCPORT + +# finish what you have begun! +tincd -n $NETNAME |