migrate to new repo layout

README: added new clean install script description
build_debian.sh: updated build_debian script (might still be broken)
install.sh: updated script to work with new layout (untested)

25 files changed, 9 insertions, 5 deletions

diff --git a/retiolum/hosts/README b/retiolum/hosts/.scripts/README
index e6ae9454..8d104179 100644
--- a/retiolum/hosts/README
+++ b/retiolum/hosts/.scripts/README
@@ -4,9 +4,11 @@ This directory contains the build and install scripts for shack-retiolum
     arch linux build script
 2. build_debian
     debian build script
-3. build_ec2
+3. build_debian_clean
+    debian script which builds a clean tinc daemon
+4. build_ec2
     Amazon ec2 base instance build script
-4. install.sh
+5. install.sh
     configures the tinc daemon 
     $1 is the nickname
     $2 is the ip-address
diff --git a/retiolum/hosts/build_arch.sh b/retiolum/hosts/.scripts/build_arch.sh
index 5ef5d765..5ef5d765 100755
--- a/retiolum/hosts/build_arch.sh
+++ b/retiolum/hosts/.scripts/build_arch.sh
diff --git a/retiolum/hosts/build_debian.sh b/retiolum/hosts/.scripts/build_debian.sh
index 3f21ec6e..d8fcec2f 100755
--- a/retiolum/hosts/build_debian.sh
+++ b/retiolum/hosts/.scripts/build_debian.sh
@@ -9,8 +9,10 @@ git clone https://github.com/makefu/shack-retiolum.git
 cd shack-retiolum
 
 ./install.sh `hostname` $MYIP
-
+cd ..
 rm shack-retiolum
 # for autostart
+sed -i '/retiolum/d' /etc/tinc/nets.boot
 echo "retiolum" >> /etc/tinc/nets.boot
+sed -i '/EXTRA/d' /etc/tinc/nets.boot
 echo "EXTRA=\"\"" >> /etc/default/tinc
diff --git a/retiolum/hosts/build_debian_clean.sh b/retiolum/hosts/.scripts/build_debian_clean.sh
index a7332f4e..a7332f4e 100755
--- a/retiolum/hosts/build_debian_clean.sh
+++ b/retiolum/hosts/.scripts/build_debian_clean.sh
diff --git a/retiolum/hosts/build_ec2.sh b/retiolum/hosts/.scripts/build_ec2.sh
index 79f2af28..79f2af28 100755
--- a/retiolum/hosts/build_ec2.sh
+++ b/retiolum/hosts/.scripts/build_ec2.sh
diff --git a/retiolum/hosts/build_no.de.sh b/retiolum/hosts/.scripts/build_no.de.sh
index 2976d3a2..2976d3a2 100644
--- a/retiolum/hosts/build_no.de.sh
+++ b/retiolum/hosts/.scripts/build_no.de.sh
diff --git a/retiolum/hosts/install.sh b/retiolum/hosts/.scripts/install.sh
index af461a30..4b21bcd4 100755
--- a/retiolum/hosts/install.sh
+++ b/retiolum/hosts/.scripts/install.sh
@@ -3,7 +3,7 @@
 
 set -e
 myname="${1:-dummy}"
-rel_hostsfile=`dirname $0`/hosts
+rel_hostsfile=`dirname $0`/..
 hostsfile=`readlink -f $rel_hostsfile`
 netname=retiolum
 myipv4="${2:-10.7.7.56}"
@@ -14,7 +14,7 @@ mkdir -p /etc/tinc/$netname
 cd /etc/tinc/$netname
 
 # get currently known hosts
-cp -r $hostsfile .
+cp -r $hostsfile hosts
 echo "added known hosts:"
 ls -1 | LC_ALL=C sort
 echo "delete the nodes you do not trust!"
diff --git a/retiolum/hosts/hosts/ITART b/retiolum/hosts/ITART
index 953c0995..953c0995 100644
--- a/retiolum/hosts/hosts/ITART
+++ b/retiolum/hosts/ITART
diff --git a/retiolum/hosts/hosts/Lassulus b/retiolum/hosts/Lassulus
index 61c2d62b..61c2d62b 100644
--- a/retiolum/hosts/hosts/Lassulus
+++ b/retiolum/hosts/Lassulus
diff --git a/retiolum/hosts/hosts/UTART b/retiolum/hosts/UTART
index 43cd213a..43cd213a 100644
--- a/retiolum/hosts/hosts/UTART
+++ b/retiolum/hosts/UTART
diff --git a/retiolum/hosts/hosts/alphalabs b/retiolum/hosts/alphalabs
index 6aea1dec..6aea1dec 100644
--- a/retiolum/hosts/hosts/alphalabs
+++ b/retiolum/hosts/alphalabs
diff --git a/retiolum/hosts/hosts/also b/retiolum/hosts/also
index 9f9dcd73..9f9dcd73 100644
--- a/retiolum/hosts/hosts/also
+++ b/retiolum/hosts/also
diff --git a/retiolum/hosts/hosts/foobaz b/retiolum/hosts/foobaz
index 47ac4d6e..47ac4d6e 100644
--- a/retiolum/hosts/hosts/foobaz
+++ b/retiolum/hosts/foobaz
diff --git a/retiolum/hosts/hosts/kaah b/retiolum/hosts/kaah
index d56014fa..d56014fa 100644
--- a/retiolum/hosts/hosts/kaah
+++ b/retiolum/hosts/kaah
diff --git a/retiolum/hosts/hosts/krebs b/retiolum/hosts/krebs
index 4aba5105..4aba5105 100644
--- a/retiolum/hosts/hosts/krebs
+++ b/retiolum/hosts/krebs
diff --git a/retiolum/hosts/hosts/miefda901 b/retiolum/hosts/miefda901
index a1b59a29..a1b59a29 100644
--- a/retiolum/hosts/hosts/miefda901
+++ b/retiolum/hosts/miefda901
diff --git a/retiolum/hosts/hosts/miefdahome b/retiolum/hosts/miefdahome
index 9a9f4310..9a9f4310 100644
--- a/retiolum/hosts/hosts/miefdahome
+++ b/retiolum/hosts/miefdahome
diff --git a/retiolum/hosts/hosts/miefdat b/retiolum/hosts/miefdat
index 43e2a6e6..43e2a6e6 100644
--- a/retiolum/hosts/hosts/miefdat
+++ b/retiolum/hosts/miefdat
diff --git a/retiolum/hosts/hosts/no_omo b/retiolum/hosts/no_omo
index f2398f18..f2398f18 100644
--- a/retiolum/hosts/hosts/no_omo
+++ b/retiolum/hosts/no_omo
diff --git a/retiolum/hosts/hosts/pa_sharepoint b/retiolum/hosts/pa_sharepoint
index 384a7c22..384a7c22 100644
--- a/retiolum/hosts/hosts/pa_sharepoint
+++ b/retiolum/hosts/pa_sharepoint
diff --git a/retiolum/hosts/hosts/pfleidi b/retiolum/hosts/pfleidi
index 416658cf..416658cf 100644
--- a/retiolum/hosts/hosts/pfleidi
+++ b/retiolum/hosts/pfleidi
diff --git a/retiolum/hosts/hosts/pornocauster b/retiolum/hosts/pornocauster
index eee28777..eee28777 100644
--- a/retiolum/hosts/hosts/pornocauster
+++ b/retiolum/hosts/pornocauster
diff --git a/retiolum/hosts/hosts/supernode b/retiolum/hosts/supernode
index 5cee4e32..5cee4e32 100644
--- a/retiolum/hosts/hosts/supernode
+++ b/retiolum/hosts/supernode
diff --git a/retiolum/hosts/hosts/tart b/retiolum/hosts/tart
index 986140ee..986140ee 100644
--- a/retiolum/hosts/hosts/tart
+++ b/retiolum/hosts/tart
diff --git a/retiolum/hosts/hosts/ytart b/retiolum/hosts/ytart
index 9f45cd2f..9f45cd2f 100644
--- a/retiolum/hosts/hosts/ytart
+++ b/retiolum/hosts/ytart