Merge branch 'master' of github.com:krebscode/painload

6 files changed, 18 insertions, 8 deletions

diff --git a/retiolum/hosts/euer b/retiolum/hosts/euer
index 6d1d15f6..6e965f83 100644
--- a/retiolum/hosts/euer
+++ b/retiolum/hosts/euer
@@ -1,6 +1,6 @@
 Address = 84.23.67.119
 Subnet = 42:974a:3ecf:3c49:06c0:4cd1:3c6f:59d9/128
-Subnet = 42.64.69.178/32
+Subnet = 10.243.0.95
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEArx2mZOPEfS8fvmQYSzWuMmNtfposJlctDfGVmhMVotaFIpIBcKuL
 dHZHI8BAStaM++DuqKv/QBjk9jF6BRAdZqHn98LHXR+VRJmFvgelEFe0uPvIRMe2
diff --git a/retiolum/hosts/kremium b/retiolum/hosts/kremium
index eb47867a..9f77be25 100644
--- a/retiolum/hosts/kremium
+++ b/retiolum/hosts/kremium
@@ -1,5 +1,5 @@
 Subnet = 42:88ec:8968:cc6b:978a:68b7:1004:fc8a/128
-Subnet = 42.135.197.75/32
+Subnet = 10.243.0.98/32
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAsdjqCyLvGfkIsawGji1CIIxGaKKdFhKJcfFK8FWiyQdgeNK/9UAh
 XsJYkSHVcXqHAorP1QAvk5fIiSEEoSwoChyecqpNOREOnN8+N8RVrs0QIwL0mwa0
diff --git a/retiolum/hosts/pornocauster b/retiolum/hosts/pornocauster
index bd1ad145..83374198 100644
--- a/retiolum/hosts/pornocauster
+++ b/retiolum/hosts/pornocauster
@@ -1,5 +1,5 @@
 Subnet = 42:0b2c:d90e:e717:03dc:9ac1:7c30:a4db/128
-Subnet = 42.178.96.179/32
+Subnet = 10.243.0.91
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAnztrijsfao+fmNtwAjqwIDKsRaMP3ECsq2T2zqKvxwCyXk69G9bG
 RFhWjgaawS9ZhnHSlgWK/vtoR0O9NxpzdU/mvdQijbVGxM02DegjO9qDSIe8EGmA
diff --git a/retiolum/hosts/skirfir b/retiolum/hosts/skirfir
new file mode 100644
index 00000000..880376c9
--- /dev/null
+++ b/retiolum/hosts/skirfir
@@ -0,0 +1,11 @@
+Subnet = 42.0.0.222
+Subnet = 42:423b:0f94:6b03:7c3c:593e:67e8:c857/128
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAvQ2yhEbW2a7rOlJGb7pV8OhDMQC00jNffM9LML+sn/BAbIX6jzzi
+XgD9o5qwyW/ktpEViUbYepIB/wBbHdMgHRWux5nPS/WygxnVKcf4mPr846udJ2kx
+/38l40DjHTzMWTV6G+TFm4+Wg7++B/NUonMJczRNjX4zDVwmObZpS+XSjl8bT1DP
+vvNHeUOr06a/IPyOF7b6B/dlr+0pr4YLFw587M1KA+eee8gvJx7YvCdwUMMJP++K
+KX30apeJQ+jpf9CsVvpxGefysMTv0uUB7Rmya3b5jjddnW0ge6lTMwT87TzIF5jz
+e3hIt+dvvq7cHI7nnyyRtKcvcm1hH+ZIaQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/scripts/routing/defaultroute.sh b/retiolum/scripts/routing/defaultroute.sh
index 9d7d6683..b7d703e8 100755
--- a/retiolum/scripts/routing/defaultroute.sh
+++ b/retiolum/scripts/routing/defaultroute.sh
@@ -40,7 +40,7 @@ do
         host -4 $host | grep "has address" | awk '{ print $4 }' |
         while read addr
         do
-            route $command $addr gw $defaultroute
+            route $command $addr gw $defaultroute && echo "$command routing to $addr via $defaultroute"
         done
     fi
 done
diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh
index 1cd7c81d..a6b50b8a 100755
--- a/retiolum/scripts/tinc_setup/install.sh
+++ b/retiolum/scripts/tinc_setup/install.sh
@@ -39,7 +39,7 @@ then
   # myipv4=$(echo 42.$(for i in `seq 1 3`; do echo "ibase=16;`bin/fillxx xx|tr [a-f] [A-F]`" | bc; done)|tr \  .)/32
 
   myipv4="${2:-}"
-  mynet4=42.0.0.0
+  mynet4=10.243.0.0
   
   if [ ! "$myipv4" ] 
   then
@@ -50,7 +50,7 @@ then
       printf 'select unused v4 subnet ip (1-255): '
       read v4num
     done
-    myipv4="42.0.0.$v4num"
+    myipv4="10.243.0.$v4num"
   fi
   echo "Subnet = $myipv4" > hosts/$myname
 
@@ -62,8 +62,7 @@ fi
 
 cat>tinc.conf<<EOF
 Name = $myname
-ConnectTo = EUcancER
-ConnectTo = kaah
+ConnectTo = euer
 ConnectTo = oxberg
 ConnectTo = pa_sharepoint
 ConnectTo = supernode