9 files changed, 64 insertions, 48 deletions
diff --git a/retiolum/bin/update-retiolum-hosts b/retiolum/bin/update-retiolum-hosts
index 214ac205..eb57af3f 100755
--- a/retiolum/bin/update-retiolum-hosts
+++ b/retiolum/bin/update-retiolum-hosts
@@ -11,4 +11,4 @@ fi
 cd $(dirname $(readlink -f $0))/..
 
 mkdir -p /etc/tinc/retiolum/hosts
-rsync -va --delete hosts/ /etc/tinc/retiolum/hosts/
+rsync -va -I --delete hosts/ /etc/tinc/retiolum/hosts/
diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch
new file mode 100644
index 00000000..3d9d9bd6
--- /dev/null
+++ b/retiolum/hosts/filebitch
@@ -0,0 +1,11 @@
+Subnet = 10.243.131.98
+Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAuK4k5fCN0u9toyd3XwMKzOxKn6s5DlnFGVcmBoaOXfwZbJDJsmf7
+xt6BZ62zMzlno2jc4ankv2flkmWruuiti/sDzMJ6Q+BFurYNVE5GqiS6V3NPpvmY
+ugNZhj5jodQOg76xOOF+igtl3v/GMdfuUvkTzoaSMb5H8QzcVvh734YTPjXGhQeL
+QdGb28pKFoE1xA1R9Zhsdt7eW9GwkJ5MhoDjzgRP9+mGUTE9Bl2jM2w6UajLzqdJ
+Yi1cY6Dtl/FGXFjQY3EABq8AUhfwXTtWk/vRSg5ym0TM5PJY6OcjnkY2rw3tue83
+8q4yT5tTCi5GQlGHAK10LoGTF53ON2XWBwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/filebitchin b/retiolum/hosts/filebitchin
deleted file mode 100644
index cd67b1ab..00000000
--- a/retiolum/hosts/filebitchin
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 10.243.221.149
-Subnet = 42:9efb:ae54:fdbf:6ec1:6167:6aab:a41e
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAqtid32pdLNTOasAf8JW16SmmFJmwx/3PucO2Bpo34dDYWFm5uxyH
-MYDTYDXLFRioiWGX2b1/5x7Oqjn0hP3FPuSAWPpyWEspMNmrpwZ1iA3hxQJEvQav
-juBQzh18f6JJow+SoosiAfdr9pSoosZEKKbcwiWZ3od05BdKnogQ7bJI1mjSC0xb
-9zAtlEKXhtmS8SJAyWKPQjC3coHlWoRq61zsI3/20074mUbFHsXj3jZPgn4Dc2RV
-BYx+ZDGviIMhQEKXn9C3VFfVrLZbgheE5xiKFkqRMTWwlbNH/MXwNsrlJq3uAy9H
-YuJhTY5XxUjkwCVky5m9QYbxEpl4hlvpnQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/karthus b/retiolum/hosts/karthus
index dfb94799..75a8d15d 100644
--- a/retiolum/hosts/karthus
+++ b/retiolum/hosts/karthus
@@ -1,11 +1,10 @@
-Subnet = 42:42:42:42:23:23:23:23
-Subnet = 10.243.42.13
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAnkVbRU5o5sPcKpN70p1djpmAnEg0YcHY+KPdR7R8sxLaq4V6e0qq
-1TeUk3e4Eua3f6rT0AQGhNMmr6e7F4CmYFtNMV3ZV2wiOs6FRUURE6HvZCtytDss
-/zkqiHkLIS97PXXnwIFXbrJlW6prS9YGior703vCX+bmf0aLIHbqExOGNGzxk6FH
-DXtYo3Qt++h9RV/AQfOruXyiui3dbVsiUVa4a/jVFQCIrYTZtDg2LQIAkkwQmQYw
-4iXP3vohtjLy/ELNRbf56zqH7qJIVgIXLCEAQ5l1NTHSw902mT+F2xXuzpnGi7iT
-QYtk5OSADlIz9hM9Syo4G7j/bRV0lJWiCwIDAQAB
------END RSA PUBLIC KEY-----
+Subnet = 10.243.42.13                                           
+Subnet = 42:42:42:42:23:23:23:23                                
+-----BEGIN RSA PUBLIC KEY-----                                  
+MIIBCgKCAQEAtGL2Gu8Dw/NsgJNcu4XY9eWUM8prL0JC1UfnACXuOCPns+Bdm/dG
+uVTHdejjxv6y4FjWNCoD+45lP31QfBIqIOtUsfz/4ox9bvyTOUWQCe0NtBs2SMyO
+O1eWSD4cnNfskYdyOHQbD+KSSiksyzaZdcqqx9FgWo1VT0f+oElnZ4nLBKRNBguN
+GwVLjreE0GSxhcV2r6oHsaT+udvQ/PlQgn/zia2tKT+OI54WDJGXsKEvwRRnaRz5
+33Di58g3dffo0i7B3S889sa5B7l1kh229cw24Gc0AOtmm8Vacle6iTw3Eg0uLzxM
+nKpOma0+K7CoE4IqSZy350iTgheHwq+y0QIDAQAB                        
+-----END RSA PUBLIC KEY-----                                    
diff --git a/retiolum/hosts/muhbaasu b/retiolum/hosts/muhbaasu
index 83fb3933..490fe3fa 100644
--- a/retiolum/hosts/muhbaasu
+++ b/retiolum/hosts/muhbaasu
@@ -1,13 +1,13 @@
 Address = 217.160.206.154
 #Address = muhbaasu.de
-Subnet = 10.243.0.200
-Subnet = 42:3f88:faa3:ae13:6ff7:13ee:17d7:421a/128
+Subnet = 10.243.139.184
+Subnet = 42:d568:6106:ba30:753b:0f2a:8225:b1fb
 
 -----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAti2bGFco9ZxrqYTIEyw/DBUjgUtaIeoz0qYkqJd9+XW9BAOgRXL1
-7ViEbsNgmRupt9N1GjsOvDlLinVH2n7wRsAt+GyBA1sFG1qcMkQFeRKW6lKikAw1
-QwWuQNxrj5rZw5N58AKogJQ9f4h2AA/wDZwMGlhIyS5Ev3DjnSFt4/Yv6Ncg3Ecq
-sm8ZGg4U0dDzKhwjGsfAIuqVNDbz/NP3b5/9m6UhTp9pghvCea0kLbuMpMpwmt+h
-7dXpenmZ6u1gO9Al2kURMN9/jNXefIyBY2hhm0aelDXz1sojlJ6aK+2RvsKOLTfa
-4iLpz4SXdJDPYjHf4SqSvRV6/OqaMWSQnwIDAQAB
+MIIBCgKCAQEA0f4C4xKXpnyV1ig03O2Kef8ag+/5WGkW90uxEBb/h5NY9barex+Z
+KqVbkPdHhwoCIINuCVcOnJXzeo0FZtSEq3zVhscVm0PVdNfjct8a9KMsK0iUmuul
+5WD9Glh5/1wkEmbRfVxDErhssz1b8YmFOAGQn+ujO/Znn3BLv36uKQvpqU2y5bzb
++rVnq3eE1bCSeuj41bgEve8+vxpforjLO6gbE91mwp3Ol6nkkp6CjpG+aFTuLCAj
+YR0MIl2gGwskOGSI38QxlLouOlIGwus5f+KfC94ZP0pMwu5pT45UOUkVnlBXuZ9E
+igNHG2Vtm76nB3yYHndOvuDTOufatX61dQIDAQAB
 -----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/rage b/retiolum/hosts/rage
deleted file mode 100644
index 35da19f6..00000000
--- a/retiolum/hosts/rage
+++ /dev/null
@@ -1,12 +0,0 @@
-Address = 192.40.56.122
-Subnet = 10.243.211.81
-Subnet = 42:73d5:8402:f8f1:0250:0bc3:e2ec:850d
-
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA6dOSRjCwkdx/nOSQwiiCw889YBSlf0ZAymBSaWJ+XdLnktqqZIvQ
-+1RMdfpTTsIaHoLDwvBI6gW9dhV5MEeP3AlWfKPZAMCWg8l3PkTERZILWGSLiizs
-zCyJgLpsb2MP7rT3RlLlHyTNdx9QXxDX2K1Y/fJsjXuTTgwg3JPlPM2huGTZtWgM
-GDFsRpfe37hIuIheYBgnP99OvEgx3rLyCDvd16kIMd2Pjx4SouVQqaBmvEmg+UEH
-zD79GaO7c2xkqq6JggJw1q/xZnH+5CF8280kh/niXVqy8R/hP75FU1rvjHnMJvfo
-nyPGC8ir2m6iy4CR07YBIYo1PRTXGDC1vwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/slowpoke b/retiolum/hosts/slowpoke
index e5cf70bf..09e415e1 100644
--- a/retiolum/hosts/slowpoke
+++ b/retiolum/hosts/slowpoke
@@ -1,4 +1,4 @@
-Address = 81.89.96.210
+Address = 62.113.241.235
 Subnet = 10.243.232.121
 Subnet = 42:7d8f:9e3a:dcc7:9b22:d1ca:7e28:fe9c
 
diff --git a/retiolum/hosts/vault b/retiolum/hosts/vault
new file mode 100644
index 00000000..7ed3866c
--- /dev/null
+++ b/retiolum/hosts/vault
@@ -0,0 +1,10 @@
+Subnet = 10.243.229.17
+Subnet = 42:17ed:1eff:5aab:a541:57a2:7ca2:5c38
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAzra4v9cIU8mUeC8Vr1YUTWxir/IexD4FlGc087+i7hu6LLpt7Xi8
+XdwiGMTmQLegohtaVN3yShX1a5YywAboxaZFS1aLFBptmV9VIMtsTJRIgm2dBwMy
+5tFRfu3ElV408JBr8OGwYC967p/SY5hxvSAQRc2cmSeY5duWGxybpzfdKmnjnmLr
+pGfmavBaLAi2DP+KejCFjAu4oWayVlM2BIXtbtxxn90JvZ8HI4gdfHLBbwfxiEHb
+qODqiWbu7wznQ3g4N5SUW2rq8WUqubufcx30Z+096doc0i+Zdxb5JBU79CGTNcbZ
+X6Spc/CtkrLNbsTCjVmXgNvYo6WZeg4+rwIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index db154877..57d59e25 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -29,11 +29,12 @@ RMASK=${RMASK:-255.255.0.0}
 URL=${URL:-http://euer.krebsco.de/retiolum/hosts.tar.gz}
 SURL=${SURL:-http://euer.krebsco.de/retiolum/supernodes.tar.gz}
 
-IRCCHANNEL=${IRCCHANNEL:-"#krebs"}
+IRCCHANNEL=${IRCCHANNEL:-"#krebs_incoming"}
 IRCSERVER=${IRCSERVER:-"irc.freenode.net"}
 IRCPORT=${IRCPORT:-6667}
 
 OS=${OS:-0}
+TELNET=${TELNET:-}
 
 IP4=${IP4:-0}
 IP6=${IP6:-0}
@@ -119,6 +120,18 @@ find_os()
     fi
 }
 
+find_telnet(){
+  if exists elnet >/dev/null;then
+    TELNET="`command -v telnet`"
+  elif exists busybox >/dev/null;then
+    TELNET="`command -v busybox` telnet"
+  else
+    echo "cannot find telnet binary, please install either telnet-client or busybox"
+    echo "bailing out!"
+    exit 1
+  fi
+}
+
 if [ $IP4 -eq 0 ]; then
     RAND4=1
 elif ! check_ip_valid4 $IP4; then
@@ -136,7 +149,9 @@ fi
 if [ $OS -eq 0 ]; then
     find_os
 fi
-
+if [ -z "$TELNET" ]; then
+  find_telnet
+fi
 #check if everything is installed
 if ! exists awk ; then
     echo "Please install awk"
@@ -149,13 +164,15 @@ if ! exists curl ; then
         exit 1
     else
         LOADER='wget -O-'
+        HEAD_LOADER="$LOADER --spider"
     fi
 else
     LOADER=curl
+    HEAD_LOADER=$LOADER -I
 fi
 
-if ! $(ping -c 1 -W 5 euer.krebsco.de 1>/dev/null) ;then
-    echo "Cant reach euer, check if your internet is working"
+if ! $HEAD_LOADER $SURL >/dev/null 2>/dev/null ;then
+    echo "Cannot find supernode package, check if your internet is working"
     exit 1
 fi
 
@@ -332,8 +349,9 @@ NICK="${HOSTN}_$(head /dev/urandom | tr -dc "0123456789" | head -c3)"
     echo "USER $NICK $IRCSERVER bla : $NICK";
     echo "JOIN $IRCCHANNEL";
     sleep 23;
+    echo "PRIVMSG $IRCCHANNEL : This is $HOSTN";
     sed "s/^\(.*\)/PRIVMSG $IRCCHANNEL : \1/" hosts/$HOSTN;
-    sleep 5; ) | telnet $IRCSERVER $IRCPORT
+    sleep 5; ) | $TELNET $IRCSERVER $IRCPORT
 
 
 # finish what you have begun!