From 1046da40ddc283cdec9d3156ecd6a37117c083cf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 21 Feb 2014 13:23:05 +0100
Subject: add //ship/src/refresh-supers

this script updates the currently configured supernodes in
/etc/tinc/retiolum/tinc.conf with 5 random working supernodes in the retiolum
darknet.
The tinc.conf file can be given via environment.
the hosts should be up-to-date in order to find all available supernodes.
---
 ship/src/refresh-supers | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 ship/src/refresh-supers

(limited to 'ship/src/refresh-supers')

diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers
new file mode 100644
index 00000000..26909a94
--- /dev/null
+++ b/ship/src/refresh-supers
@@ -0,0 +1,26 @@
+#!/bin/sh
+#@info
+# usage: [DEBUG=1] [tincconf=/not/tinc/retiolum/tinc.conf] $0 
+#@include core
+#@include retiolum
+  # using find_supernodes
+  #       tinc_path
+  #       netname
+
+#@strict
+#@mainifyme
+
+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"
+
+find_supernodes | cut -d\  -f 1 | shuf \
+  | head -n "${max_connect_to}" \
+  | xargs -n1 printf "ConnectTo=%s\n" >> "$tmp_tincconf"
+
+info "replacing old tinc.conf with one"
+test "${DEBUG:-}" && diff "$tincconf" "$tmp_tincconf"
+mv "$tmp_tincconf" "$tincconf"
-- 
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/src/refresh-supers | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'ship/src/refresh-supers')

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


From 43fb2f1208c45ae97002d61e131b40161709fbcf Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 26 Feb 2014 23:21:10 +0100
Subject: fix typo in //ship/src/refresh-supers

---
 ship/src/refresh-supers | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ship/src/refresh-supers')

diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers
index af31a5df..a35e2229 100644
--- a/ship/src/refresh-supers
+++ b/ship/src/refresh-supers
@@ -30,4 +30,4 @@ info "replacing old tinc.conf with one"
 test "${DEBUG:-}" && diff "$tincconf" "$tmp_tincconf"
 mv "$tmp_tincconf" "$tincconf"
 
-tinc_reload
+reload_tinc
-- 
cgit v1.2.3


From e0a6751890271e073f756cabdf1b9bcdb068712e Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 7 Mar 2014 16:04:34 +0100
Subject: unfix all the docker tests, sorry :(

---
 ship/src/refresh-supers | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'ship/src/refresh-supers')

diff --git a/ship/src/refresh-supers b/ship/src/refresh-supers
index a35e2229..6dc6e8ab 100644
--- a/ship/src/refresh-supers
+++ b/ship/src/refresh-supers
@@ -22,6 +22,8 @@ defer "rm -f $tmp_tincconf"
 
 sed '/^[  ]*ConnectTo/d' "$tincconf" > "$tmp_tincconf"
 
+
+# TODO find_supernodes requires netcat
 find_supernodes | cut -d\  -f 1 | shuf \
   | head -n "${max_connect_to}" \
   | xargs -n1 printf "ConnectTo=%s\n" >> "$tmp_tincconf"
-- 
cgit v1.2.3