summaryrefslogtreecommitdiffstats
path: root/retiolum/scripts
diff options
context:
space:
mode:
authorkrebs <krebs@fuerkrebs>2011-10-13 13:20:02 -0400
committerkrebs <krebs@fuerkrebs>2011-10-13 13:20:02 -0400
commit6caf0d1c502ba9eb6d41aa9a80cb8a350164846d (patch)
tree28237066c93656fe75b2fcc7fb1eec0a2b800888 /retiolum/scripts
parentfa7213811c2c77b9f2097c11c8a072265d8a3ac2 (diff)
parent1cff2a9d548336ddcd8a2d732ed2cd348c8e6b79 (diff)
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum/scripts')
-rwxr-xr-xretiolum/scripts/tinc_setup/install.sh6
-rw-r--r--retiolum/scripts/tinc_setup/write_channel.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh
index 547cf366..a550a068 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
@@ -53,10 +54,11 @@ cp $CURR/tinc-up /etc/tinc/$netname/
cat>tinc.conf<<EOF
Name = $myname
-ConnectTo = supernode
+ConnectTo = EUcancER
ConnectTo = kaah
+ConnectTo = oxberg
ConnectTo = pa_sharepoint
-ConnectTo = EUcancER
+ConnectTo = supernode
Device = /dev/net/tun
EOF
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