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

10 files changed, 17 insertions, 10 deletions

diff --git a/keydir/lass.pub b/keydir/lass.pub
new file mode 100644
index 00000000..c3688448
--- /dev/null
+++ b/keydir/lass.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAp83zynhIueJJsWlSEykVSBrrgBFKq38+vT8bRfa+csqyjZBl2SQFuCPo+Qbh49mwchpZRshBa9jQEIGqmXxv/PYdfBFQuOFgyUq9ZcTZUXqeynicg/SyOYFW86iiqYralIAkuGPfQ4howLPVyjTZtWeEeeEttom6p6LMY5Aumjz2em0FG0n9rRFY2fBzrdYAgk9C0N6ojCs/Gzknk9SGntA96MDqHJ1HXWFMfmwOLCnxtE5TY30MqSmkrJb7Fsejwjoqoe9Y/mCaR0LpG2cStC1+37GbHJNH0caCMaQCX8qdfgMVbWTVeFWtV6aWOaRgwLrPDYn4cHWQJqTfhtPrNQ== death@uriel
diff --git a/keydir/makefu.pub b/keydir/makefu.pub
new file mode 100644
index 00000000..6092ec46
--- /dev/null
+++ b/keydir/makefu.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCl3RTOHd5DLiVeUbUr/GSiKoRWknXQnbkIf+uNiFO+XxiqZVojPlumQUVhasY8UzDzj9tSDruUKXpjut50FhIO5UFAgsBeMJyoZbgY/+R+QKU00Q19+IiUtxeFol/9dCO+F4o937MC0OpAC10LbOXN/9SYIXueYk3pJxIycXwUqhYmyEqtDdVh9Rx32LBVqlBoXRHpNGPLiswV2qNe0b5p919IGcslzf1XoUzfE3a3yjk/XbWh/59xnl4V7Oe7+iQheFxOT6rFA30WYwEygs5As//ZYtxvnn0gA02gOnXJsNjOW9irlxOUeP7IOU6Ye3WRKFRR0+7PS+w8IJLag2xb makefu@pornocauster
diff --git a/keydir/matz.pub b/keydir/matz.pub
new file mode 100644
index 00000000..35988998
--- /dev/null
+++ b/keydir/matz.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDGJd2nwNiiaH+raIdSmlRhBpmv9cJ9yNiRfu9u7fGdHVVEN9sJhKL4jsZisPyaoQmEVQ96EUHRpQpqy9PyUsbP3gA4O3IQEzw5KUO5hFSJ/QoSDP0u1FAYqW6JHCSldrbs/wZbZLcO+3ykMnGWJh70jhhQTFQPCKGSjEFBvNveAS1FF6qIlXmJbRjtb3PUtPrryXHXtpzp1lQ7nfsExiBKW1/WaSL5/Wy/nj1C6LqDz4ONTRZ6KcO064ZpyDMMRaiFY/d8fT8mkY7es2fspPvJWlLAHpwIPW1vR75P0iuyN0MaVL1PoV8ISo04+cG3/4Hwkws7K2qh8GurCACmw2WR matz@dei.local
diff --git a/keydir/tv.pub b/keydir/tv.pub
new file mode 100644
index 00000000..d295bbe4
--- /dev/null
+++ b/keydir/tv.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDYv5OkVrnerkzJwgi7ol7HzcWJf4oWCJTX84trFX5vgJXu1zMvSe+koY8xpnMOd7WHF2wgsjjrFlMuixTrfMPc/OjvG2N1TlnvzlFD8ivTW/AJzDwNxT//niqAYAZ9kmb8e/zE/SyNHSKZcyEKGiiW2+YW9wWHPYRP/XiNEjLP3BeTGScMwWr001V/8m7ne4SGHrE1FbHbHqaBXgqUFgnvzMY3CsfDafODZlj5xSMNGHyLGNNKvu3YR1crcAjbQrBXBdwaArThFxp+e2uWrnffshlks6WtRyR1AFVjc/gxEG74Axq1AHY6EJm2Fw/JdFNiYQ7yyQZHS9bZJYjgnWF tv@nomic
diff --git a/keydir/uriel.pub b/keydir/uriel.pub
new file mode 100644
index 00000000..431c510b
--- /dev/null
+++ b/keydir/uriel.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDvw8SenwAMo/fz/UiosuxVg5TJgL4xkG2JSJsC/N1CKW4LmYt2YPQpW88XjtpBw1rrkIV3ZTxa0vMeQmixqJhnLf3/ZS6nocQLhCMiBSVvFkr5TekeyBpEnjdv6MNM84A1rCXmJNtlsIh1V2OzVlNoZkzaOzQo81uyFmQPYPS9VJo4sGYHip58lIBPdGzXmLEl6waL0Hy6RA2S83tildt3z0OncT+zoZrwqm71tii3oPk7Q5sSBBMMdDjQqyEXXcXaD6wpokhNMiZVr7xdoN8wnb1FNHYWgubJPoqgQ+2lw0TcUEZGk9rUWddepEYYZM18tpBkhvucluTpNiy1P78qyX3Yqkt3t2SvCmrMvogt/ytjUma5AZR+BtN8ri8/FkBn0ehBJXg+dOd4EjJ3HahrBUy4IC2xeK4Z95i0sYKJgVUe8+E5c81PbKiV1dE6ETsxX3gFJypDWiszWNNt+PYmVRK0rVacTkpHXCJRbfAhEiXhFstoENDRK7o77r+v8xJpTScM2cZRl9r9OwLi+MuTyDTC45NhBdWkKB2Z65NRqtKGChrJecZ9CizqrXcw4tvhLUuUZNIFU1eYwywaXJBTEoV3nlgZjVOdjgVg/wfYXCbpxHXwx2VAtqeQtSLu9uwuPlMKctMjgOvibNmqGNJINwkL7HyyiikdAoICwytXAQ== lass@uriel
diff --git a/retiolum/Makefile b/retiolum/Makefile
index 54683469..54683469 100755..100644
--- a/retiolum/Makefile
+++ b/retiolum/Makefile
diff --git a/retiolum/bin/hosts b/retiolum/bin/hosts
index 4856d494..44dbd88d 100755
--- a/retiolum/bin/hosts
+++ b/retiolum/bin/hosts
@@ -6,8 +6,8 @@ netname=${1-retiolum}
 cd /etc/tinc/$netname/hosts
 
 for i in `ls`; do
-  sed -n '
-    s|^ *Subnet *= *\([^ /]*\)\(/[0-9]*\)\? *$|\1\t'$i'.'$netname' '$i'|p
+  sed -En '
+    s|^ *Subnet *= *([^ /]*)(/[0-9]*)? *$|\1	'$i'.'$netname' '$i'|p
   ' $i
 done | sort
 
diff --git a/retiolum/bin/update-retiolum-hosts b/retiolum/bin/update-retiolum-hosts
index eb57af3f..0eae1c29 100755
--- a/retiolum/bin/update-retiolum-hosts
+++ b/retiolum/bin/update-retiolum-hosts
@@ -8,7 +8,7 @@ if test "${nosudo-false}" != true -a `id -u` != 0; then
 fi
 
 # cd //retiolum
-cd $(dirname $(readlink -f $0))/..
+cd -P "$(dirname "$0")/.."
 
 mkdir -p /etc/tinc/retiolum/hosts
 rsync -va -I --delete hosts/ /etc/tinc/retiolum/hosts/
diff --git a/retiolum/bin/update_tinc_hosts b/retiolum/bin/update_tinc_hosts
index ce1be497..46076cf2 100755
--- a/retiolum/bin/update_tinc_hosts
+++ b/retiolum/bin/update_tinc_hosts
@@ -7,11 +7,8 @@ if test "${nosudo-false}" != true -a `id -u` != 0; then
   exit 23 # go to hell
 fi
 
-list_hosts="$(
-  basename="`readlink -f "$0"`"
-  bindir="`dirname "$basename"`"
-  echo "$bindir/hosts"
-)"
+list_hosts=$(cd -P "$(dirname "$0")" && pwd -P)/hosts
+
 hosts() { "$list_hosts"; }
 
 hosts="${hosts-/etc/hosts}"
diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index b48649ec..1f45a3cc 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -43,6 +43,11 @@ main(){
   RAND4=1
   RAND6=1
 
+  if $(echo $HOSN | grep -q -); then
+    echo 'invalid hostname, - not allowed'
+    exit 1
+  fi
+
 
   if [ $IP4 -eq 0 ]; then
     RAND4=1
@@ -196,9 +201,9 @@ LocalDiscovery = yes
 AutoConnect = 3
 
 #ConnectTos
-ConnectTo = slowpoke
+ConnectTo = fastpoke
 ConnectTo = pigstarter
-ConnectTo = pico
+ConnectTo = kheurop
 EOF
 
   host2subnet $MASK4