From be4d573b21895449e57a8263a5a9ca292500a74b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 26 Feb 2014 17:04:54 +0100
Subject: sort //ship/lib/retiolum

---
 ship/lib/retiolum | 56 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 27 deletions(-)

(limited to 'ship')

diff --git a/ship/lib/retiolum b/ship/lib/retiolum
index 2a5c7338..3956a200 100644
--- a/ship/lib/retiolum
+++ b/ship/lib/retiolum
@@ -5,34 +5,9 @@ tinc_path=${tinc_path:-/etc/tinc}
 netname=${netname:-retiolum}
 hosts_dir=${hosts_dir:-$tinc_path/$netname/hosts}
 
-check_free_v4(){
-  myipv4=${1-10.243.0.-1}
-  v4num=${myipv4##*.}
-  printf "Retard check: "
-  if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ];
-  then 
-    info "No retard detected\n"
-    cd $hosts_dir
-    info "Check if ip is still free: "
-    for i in `ls -1`; do
-      if grep -q -e $myipv4\$ $i ;then
-        warn "Host IP already taken by $i! "
-        return 1
-      fi
-    done
-    info "Passed\n"
-    return 0
-  else
-    error "you are made of stupid. bailing out\n" 
-    return 1
-  fi
-  cd - >/dev/null
-}
 
-find_active_nodes(){
-  # TODO this function currently only supports a single address for a host
+find_supernodes(){
   cd $hosts_dir
-  # posix grep does not support [[:space:]]
   set +f
   for name in `
     grep '^[  ]*Address[  ]*=' * |
@@ -54,8 +29,11 @@ find_active_nodes(){
   wait
   cd - >/dev/null
 }
-find_supernodes(){
+
+find_active_nodes(){
+  # TODO this function currently only supports a single address for a host
   cd $hosts_dir
+  # posix grep does not support [[:space:]]
   set +f
   for name in `
     grep '^[  ]*Address[  ]*=' * |
@@ -77,3 +55,27 @@ find_supernodes(){
   wait
   cd - >/dev/null
 }
+
+check_free_v4(){
+  myipv4=${1-10.243.0.-1}
+  v4num=${myipv4##*.}
+  printf "Retard check: "
+  if [ "$v4num" -gt 0 -a "$v4num" -lt "256" ];
+  then 
+    info "No retard detected\n"
+    cd $hosts_dir
+    info "Check if ip is still free: "
+    for i in `ls -1`; do
+      if grep -q -e $myipv4\$ $i ;then
+        warn "Host IP already taken by $i! "
+        return 1
+      fi
+    done
+    info "Passed\n"
+    return 0
+  else
+    error "you are made of stupid. bailing out\n" 
+    return 1
+  fi
+  cd - >/dev/null
+}
-- 
cgit v1.2.3


From d818d26256380d1be91cb3d449271da96adb2105 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 26 Feb 2014 22:53:35 +0100
Subject: implement IRC proposal to refresh supernodes

//ship/src/refresh-supers is the script which will update your tinc config and
choose 5 working supernodes for you to connect to.

This proposal may become part of the tinc.krebsco.de install script
---
 ship/lib/retiolum           | 20 +++++++++++++++++++-
 ship/src/refresh-super-keys |  5 +++++
 ship/src/refresh-supers     |  9 ++++++++-
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 ship/src/refresh-super-keys

(limited to 'ship')

diff --git a/ship/lib/retiolum b/ship/lib/retiolum
index 3956a200..1e55041c 100644
--- a/ship/lib/retiolum
+++ b/ship/lib/retiolum
@@ -1,10 +1,28 @@
 #!/bin/sh
 # retiolum host functions
 #@include core
+#@include network
 tinc_path=${tinc_path:-/etc/tinc}
 netname=${netname:-retiolum}
 hosts_dir=${hosts_dir:-$tinc_path/$netname/hosts}
+supernode_urls="http://euer.krebsco.de/retiolum/supernodes.tar.gz"
+reload_tinc(){
+  info "reloading tinc configuration"
+  pkill -HUP tincd || tinc -n $netname reload;
+}
 
+refresh_supernode_keys(){
+  for url in $supernode_urls;do
+    info "Trying $url to retrieve supernodes"
+    if http_get "$url" \
+       | tar xvz -C $hosts_dir | xargs -n1 echo "refreshed:" ;then
+      info "refreshed supernode keys"
+      return 0
+    else
+      error "$url unusable for retrieving supernode host files"
+    fi
+  done && return 1
+}
 
 find_supernodes(){
   cd $hosts_dir
@@ -67,7 +85,7 @@ check_free_v4(){
     info "Check if ip is still free: "
     for i in `ls -1`; do
       if grep -q -e $myipv4\$ $i ;then
-        warn "Host IP already taken by $i! "
+        error "Host IP already taken by $i! "
         return 1
       fi
     done
diff --git a/ship/src/refresh-super-keys b/ship/src/refresh-super-keys
new file mode 100644
index 00000000..dddbe846
--- /dev/null
+++ b/ship/src/refresh-super-keys
@@ -0,0 +1,5 @@
+#!/bin/sh
+#@info
+#@include retiolum
+#@mainifyme
+refresh_supernode_keys
diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers
index 26909a94..af31a5df 100644
--- a/ship/src/refresh-supers
+++ b/ship/src/refresh-supers
@@ -1,6 +1,9 @@
 #!/bin/sh
 #@info
 # usage: [DEBUG=1] [tincconf=/not/tinc/retiolum/tinc.conf] $0 
+# This is the implementation of the proposal how to update tinc supernode
+# connections 
+
 #@include core
 #@include retiolum
   # using find_supernodes
@@ -10,12 +13,14 @@
 #@strict
 #@mainifyme
 
+refresh_supernode_keys
+
 max_connect_to=${max_connect_to:-5}
 tincconf=${tincconf:-$tinc_path/$netname/tinc.conf}
 tmp_tincconf=$(mktemp)
 defer "rm -f $tmp_tincconf"
 
-sed '/[  ]*ConnectTo=/d' "$tincconf" > "$tmp_tincconf"
+sed '/^[  ]*ConnectTo/d' "$tincconf" > "$tmp_tincconf"
 
 find_supernodes | cut -d\  -f 1 | shuf \
   | head -n "${max_connect_to}" \
@@ -24,3 +29,5 @@ find_supernodes | cut -d\  -f 1 | shuf \
 info "replacing old tinc.conf with one"
 test "${DEBUG:-}" && diff "$tincconf" "$tmp_tincconf"
 mv "$tmp_tincconf" "$tincconf"
+
+tinc_reload
-- 
cgit v1.2.3