From 88b6956f32ed74be82a401a7716398a622a9042f Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Mon, 10 Dec 2012 01:12:54 +0100
Subject: more checks, fixed loop

---
 retiolum/scripts/tinc_setup/new_install.sh | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index bbf4475e..45316796 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -61,7 +61,7 @@ host2subnet()
 
     result=$(($(($((1 << $1)) - 1)) << $((32 - $1))))
     byte=""
-    for ((i=0;i<3;i+=1)); do
+    for i in {0..2}; do
         byte=.$(($result % 256))$byte
         result=$(($result / 256))
     done
@@ -151,11 +151,26 @@ if ! which awk&>/dev/null; then
     exit 1
 fi
 
-if ! which curl&>/dev/null; then
-    echo "Please install curl"
+if ! which hostname&>/dev/null; then
+    echo "Please install hostname"
     exit 1
 fi
 
+if ! which openssl&>/dev/null; then
+    echo "Please install openssl"
+    exit 1
+fi
+
+if ! which curl&>/dev/null; then
+    if ! which wget&>/dev/null; then
+        echo "Please install curl or wget"
+        exit 1
+    else
+        LOADER='wget -O-'
+else
+    LOADER=curl
+fi
+
 if ! $(/bin/ping -c 1 euer.krebsco.de -W 5 &>/dev/null) ;then
     echo "Cant reach euer, check if your internet is working"
     exit 1
@@ -232,7 +247,7 @@ fi
 
 #get tinc-hostfiles
 mkdir -p $TEMPDIR/hosts
-curl euer.krebsco.de/retiolum/hosts.tar.gz | tar zx -C $TEMPDIR/hosts/
+$LOADER euer.krebsco.de/retiolum/hosts.tar.gz | tar zx -C $TEMPDIR/hosts/
 
 #check for free ip
 #version 4
-- 
cgit v1.2.3


From 7fc8f37b2cd2203881deb27b6a757f6d82eeb118 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Mon, 10 Dec 2012 01:16:04 +0100
Subject: fixed typo

---
 retiolum/scripts/tinc_setup/new_install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 45316796..94319bfd 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -167,6 +167,7 @@ if ! which curl&>/dev/null; then
         exit 1
     else
         LOADER='wget -O-'
+    fi
 else
     LOADER=curl
 fi
-- 
cgit v1.2.3


From bf7e7d7db64bb7c8827cb176d2ac6b8dd06741fc Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Mon, 10 Dec 2012 01:35:11 +0100
Subject: changed random source

---
 retiolum/scripts/tinc_setup/new_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 94319bfd..049eeca5 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -254,7 +254,7 @@ $LOADER euer.krebsco.de/retiolum/hosts.tar.gz | tar zx -C $TEMPDIR/hosts/
 #version 4
 until check_ip_taken $IP4; do
     if [ $RAND4 -eq 1 ]; then
-        IP4="$SUBNET4.$((RANDOM%255)).$((RANDOM%255))"
+        IP4="$SUBNET4.$(( $(head /dev/urandom | tr -dc "123456789" | head -c3) %255)).$(( $(head /dev/urandom | tr -dc "123456789" | head -c3) %255))"
     else
         printf 'choose new ip: '
         read IP4
@@ -360,7 +360,7 @@ else
 fi
 
 #write to irc-channel
-NICK="${HOSTN}_$((RANDOM%666))"
+NICK="${HOSTN}_$(head /dev/urandom | tr -dc "0123456789" | head -c3)"
 
 (   echo "NICK $NICK";
     echo "USER $NICK $IRCSERVER bla : $NICK";
-- 
cgit v1.2.3


From bce2e977ba603a3fa27d77827263a99d2913482e Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Mon, 10 Dec 2012 01:48:25 +0100
Subject: removed openssl dependency

---
 retiolum/scripts/tinc_setup/new_install.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 049eeca5..275805a7 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -156,11 +156,6 @@ if ! which hostname&>/dev/null; then
     exit 1
 fi
 
-if ! which openssl&>/dev/null; then
-    echo "Please install openssl"
-    exit 1
-fi
-
 if ! which curl&>/dev/null; then
     if ! which wget&>/dev/null; then
         echo "Please install curl or wget"
@@ -268,7 +263,7 @@ done
 #version 6
 until check_ip_taken $IP6; do
     if [ $RAND6 -eq 1 ]; then
-        IP6="$SUBNET6$(openssl rand -hex 14 | sed 's/..../:&/g')" #todo: generate ip length from hostmask
+        IP6="$SUBNET6$(head /dev/urandom | tr -dc "0123456789abcdef" | head -c28 | sed 's/..../:&/g')" #todo: generate ip length from hostmask
     else
         printf 'ip taken, choose new ip: '
 
-- 
cgit v1.2.3


From 8253b111a9d61ff9763bf6bf588c852a5a948c84 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Mon, 10 Dec 2012 01:58:30 +0100
Subject: added variable IPv6 length

---
 retiolum/scripts/tinc_setup/new_install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 275805a7..cc9746b5 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -263,7 +263,9 @@ done
 #version 6
 until check_ip_taken $IP6; do
     if [ $RAND6 -eq 1 ]; then
-        IP6="$SUBNET6$(head /dev/urandom | tr -dc "0123456789abcdef" | head -c28 | sed 's/..../:&/g')" #todo: generate ip length from hostmask
+        NETLENGTH=$(expr $(expr 128 - $MASK6) / 4)
+        echo $NETLENGTH
+        IP6="$SUBNET6$(head /dev/urandom | tr -dc "0123456789abcdef" | head -c$NETLENGTH | sed 's/..../:&/g')" #todo: generate ip length from hostmask
     else
         printf 'ip taken, choose new ip: '
 
-- 
cgit v1.2.3


From 5390ca9c00a2a49b452329da9c1dc6d28cd49a6d Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Mon, 10 Dec 2012 02:01:05 +0100
Subject: removed debug output

---
 retiolum/scripts/tinc_setup/new_install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index cc9746b5..e5f99f71 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -264,7 +264,6 @@ done
 until check_ip_taken $IP6; do
     if [ $RAND6 -eq 1 ]; then
         NETLENGTH=$(expr $(expr 128 - $MASK6) / 4)
-        echo $NETLENGTH
         IP6="$SUBNET6$(head /dev/urandom | tr -dc "0123456789abcdef" | head -c$NETLENGTH | sed 's/..../:&/g')" #todo: generate ip length from hostmask
     else
         printf 'ip taken, choose new ip: '
-- 
cgit v1.2.3


From 9ef1a44576b52a84b8f1b5fa2752253f0432f486 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 02:13:23 +0100
Subject: added some stuff

---
 retiolum/scripts/tinc_setup/new_install.sh | 48 +++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index e5f99f71..1885d681 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+
 
 #get sudo
 if test "${nosudo-false}" != true -a `id -u` != 0; then
@@ -10,8 +10,9 @@ fi
 #
 SUBNET4=${SUBNET4:-10.243}
 SUBNET6=${SUBNET6:-42}
-TEMPDIR=${TEMPDIR:-/tmp/tinc-install-fu}
-HOSTN=${HOSTN:-$(hostname)}
+TEMPDIR=${TEMPDIR:-auto}
+SYSHOSTN=${HOSTNAME:-$(hostname)}
+HOSTN=${HOSTN:-$SYSHOSTN}
 NETNAME=${NETNAME:-retiolum}
 MASK4=${MASK4:-16}
 MASK6=${MASK6:-16}
@@ -48,7 +49,7 @@ Options:
  -o \$HOST   Choose another Hostname, default is your system hostname
  -n \$NET    Choose another tincd netname,this also specifies the path to your tinc config, default is retiolum
  -u \$URL    specify another hostsfiles.tar.gz url, default is euer.krebsco.de/retiolum/hosts.tar.gz
- -l \$OS     specify an OS, numeric parameter.0=Automatic 1=ArchLinux 2=OpenWRT, disables automatic OS-finding, default is 0
+ -l \$OS     specify an OS, numeric parameter.0=Automatic 1=Linux 2=Android, disables automatic OS-finding, default is 0
  -r \$ADDR   give the node an reachable remote address, ipv4 or dns
 EOF
 }
@@ -119,9 +120,9 @@ get_hostname()
 #os autodetection
 find_os()
 {
-    if grep -q "Arch Linux" /etc/*release; then
+    if grep -qe '.*' /etc/*release 2>/dev/null; then
         OS=1
-    elif grep -q "OpenWrt" /etc/*release; then
+    elif which getprop&>/dev/null; then
         OS=2
     fi
 }
@@ -139,23 +140,17 @@ elif ! check_ip_valid6 $IP6; then
     exit 1
 fi
 
-
-#check if everything is installed
-if ! which tincd&>/dev/null; then
-    echo "Please install tinc"
-    exit 1
+#find OS
+if [ $OS -eq 0 ]; then
+    find_os
 fi
 
+#check if everything is installed
 if ! which awk&>/dev/null; then
     echo "Please install awk"
     exit 1
 fi
 
-if ! which hostname&>/dev/null; then
-    echo "Please install hostname"
-    exit 1
-fi
-
 if ! which curl&>/dev/null; then
     if ! which wget&>/dev/null; then
         echo "Please install curl or wget"
@@ -233,6 +228,25 @@ do
     esac
 done
 
+#check if everything is installed
+if [ $OS -eq 2 ]; then
+    if ! test -e /data/data/org.poirsouille.tinc_gui/files/tincd; then
+        echo "Please install tinc-gui"
+        exit 1
+    else
+        TINCBIN=/data/data/org.poirsouille.tinc_gui/files/tincd
+        if [ $TEMPDIR == 'auto' ]; then TEMPDIR=/data/secure/data ;fi
+    fi
+else
+    if ! which tincd&>/dev/null; then
+        echo "Please install tinc"
+        exit 1
+    else
+        TINCBIN=tincd
+        if [ $TEMPDIR == 'auto' ]; then TEMPDIR=/mnt/tinc-install-fu ;fi
+    fi
+fi
+
 #generate full subnet information for v4
 
 #test if tinc directory already exists
@@ -352,7 +366,7 @@ if which tincctl&>/dev/null; then
     yes | tincctl -n $NETNAME generate-keys
     cat rsa_key.pub >> hosts/$HOSTN
 else
-    yes | tincd -n $NETNAME -K
+    yes | $TINCBIN -n $NETNAME -K
 fi
 
 #write to irc-channel
-- 
cgit v1.2.3


From 5d253ae8e4b712c95ff2b7c33457dad263928de0 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 03:54:15 +0100
Subject: fixing for android

---
 retiolum/scripts/tinc_setup/new_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 1885d681..aea97e90 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -162,7 +162,7 @@ else
     LOADER=curl
 fi
 
-if ! $(/bin/ping -c 1 euer.krebsco.de -W 5 &>/dev/null) ;then
+if ! $(ping -c 1 euer.krebsco.de -W 5 1>/dev/null) ;then
     echo "Cant reach euer, check if your internet is working"
     exit 1
 fi
-- 
cgit v1.2.3


From dcac6e109c6b8ec56c5106d11dad052b9ce34aca Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 03:57:03 +0100
Subject: fixed find_os not executing

---
 retiolum/scripts/tinc_setup/new_install.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index aea97e90..1f750fca 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -228,6 +228,12 @@ do
     esac
 done
 
+#check for OS
+if [ $OS -eq 0 ]; then
+    echo $OS
+    find_os
+fi
+
 #check if everything is installed
 if [ $OS -eq 2 ]; then
     if ! test -e /data/data/org.poirsouille.tinc_gui/files/tincd; then
@@ -294,11 +300,6 @@ done
 #check for free hostname
 get_hostname $HOSTN
 
-#check for OS
-if [ $OS -eq 0 ]; then
-    echo $OS
-    find_os
-fi
 
 #create the configs
 mkdir -p /etc/tinc/$NETNAME
-- 
cgit v1.2.3


From 3e14311b99f0cb6a304314fae02dab8a0bfb9eb6 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 04:05:01 +0100
Subject: added #!/bin/sh

---
 retiolum/scripts/tinc_setup/new_install.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 1f750fca..c6a572d2 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -1,4 +1,4 @@
-
+#!/bin/sh
 
 #get sudo
 if test "${nosudo-false}" != true -a `id -u` != 0; then
-- 
cgit v1.2.3


From 7bea72bbc15bbc0ae20726f928a64953fca547a4 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 04:11:07 +0100
Subject: added different directory for android

---
 retiolum/scripts/tinc_setup/new_install.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index c6a572d2..7a62e13b 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -302,8 +302,13 @@ get_hostname $HOSTN
 
 
 #create the configs
-mkdir -p /etc/tinc/$NETNAME
-cd /etc/tinc/$NETNAME
+if [ $OS -eq 2 ];then
+    mkdir -p /usr/local/etc/tinc/$NETNAME
+    cd /usr/local/etc/tinc/$NETNAME
+else
+    mkdir -p /etc/tinc/$NETNAME
+    cd /etc/tinc/$NETNAME
+fi
 
 mv $TEMPDIR/hosts ./
 
-- 
cgit v1.2.3


From 8761ca8b7a09f084e9cc57449a96edd4fe297d5f Mon Sep 17 00:00:00 2001
From: tv <tv@nomic>
Date: Wed, 12 Dec 2012 05:06:35 +0100
Subject: retiolum/hosts: add nomic

---
 retiolum/hosts/nomic | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 retiolum/hosts/nomic

diff --git a/retiolum/hosts/nomic b/retiolum/hosts/nomic
new file mode 100644
index 00000000..d9604985
--- /dev/null
+++ b/retiolum/hosts/nomic
@@ -0,0 +1,11 @@
+Subnet = 10.243.0.110
+Subnet = 42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec/128
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+
+qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw
+Kd4tHVdoQgJW5yFepmT9IUmHqkxXJ0R2W93l2eSZNOcnFvFn0ooiAlRi4zAiHClu
+5Mz80Sc2rvez+n9wtC2D06aYjP23pHYld2xighHR9SUqX1dFzgSXNSoWWCcgNp2a
+OKcM8LzxLV7MTMZFOJCJndZ77e4LsUvxhQFP6nyKZWg30PC0zufZsuN5o2xsWSlA
+Wi9sMB1AUR6mZrxgcgTFpUjbjbLQf+36CwIDAQAB
+-----END RSA PUBLIC KEY-----
-- 
cgit v1.2.3


From 507a7e6cad2316938efee372e51c1d042a807495 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 05:07:32 +0100
Subject: more android fixes

---
 retiolum/scripts/tinc_setup/new_install.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 7a62e13b..832fcd91 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -256,10 +256,16 @@ fi
 #generate full subnet information for v4
 
 #test if tinc directory already exists
-if test -e /etc/tinc/$NETNAME; then
-    echo "tinc config directory /etc/tinc/$NETNAME does already exist. (backup and) delete config directory and restart"
-    exit 1
-fi
+if [ $OS -eq 2 ]; then
+    if test -e /usr/local/etc/tinc/$NETNAME; then
+        echo "tinc config directory /usr/local/etc/tinc/$NETNAME does already exist. (backup and) delete config directory and restart"
+        exit 1
+    fi
+else
+    if test -e /etc/tinc/$NETNAME; then
+        echo "tinc config directory /etc/tinc/$NETNAME does already exist. (backup and) delete config directory and restart"
+        exit 1
+    fi
 
 #get tinc-hostfiles
 mkdir -p $TEMPDIR/hosts
@@ -311,6 +317,7 @@ else
 fi
 
 mv $TEMPDIR/hosts ./
+rm -r $TEMDIR
 
 echo "Subnet = $IP4" > hosts/$HOSTN
 echo "Subnet = $IP6" >> hosts/$HOSTN
-- 
cgit v1.2.3


From 883051176857575df7ec539da87117c0d24ab5a8 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 05:09:24 +0100
Subject: forgot fi

---
 retiolum/scripts/tinc_setup/new_install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 832fcd91..5f09bb15 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -266,6 +266,7 @@ else
         echo "tinc config directory /etc/tinc/$NETNAME does already exist. (backup and) delete config directory and restart"
         exit 1
     fi
+fi
 
 #get tinc-hostfiles
 mkdir -p $TEMPDIR/hosts
-- 
cgit v1.2.3


From c8e87631c19d0eda9875e7d91c57fd9aef90863a Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 05:13:06 +0100
Subject: fixed some more borken stuff

---
 retiolum/scripts/tinc_setup/new_install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 5f09bb15..0a2c3201 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -249,7 +249,7 @@ else
         exit 1
     else
         TINCBIN=tincd
-        if [ $TEMPDIR == 'auto' ]; then TEMPDIR=/mnt/tinc-install-fu ;fi
+        if [ $TEMPDIR == 'auto' ]; then TEMPDIR=/tmp/tinc-install-fu ;fi
     fi
 fi
 
@@ -318,7 +318,7 @@ else
 fi
 
 mv $TEMPDIR/hosts ./
-rm -r $TEMDIR
+rm -r $TEMPDIR
 
 echo "Subnet = $IP4" > hosts/$HOSTN
 echo "Subnet = $IP6" >> hosts/$HOSTN
-- 
cgit v1.2.3


From a8b2350b088245cdef0dfa0ede55f0354cb42e17 Mon Sep 17 00:00:00 2001
From: Lassulus <lassulus@googlemail.com>
Date: Wed, 12 Dec 2012 05:21:11 +0100
Subject: added TINCDIR as possible value

---
 retiolum/scripts/tinc_setup/new_install.sh | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh
index 0a2c3201..f686e34f 100755
--- a/retiolum/scripts/tinc_setup/new_install.sh
+++ b/retiolum/scripts/tinc_setup/new_install.sh
@@ -11,6 +11,7 @@ fi
 SUBNET4=${SUBNET4:-10.243}
 SUBNET6=${SUBNET6:-42}
 TEMPDIR=${TEMPDIR:-auto}
+TINCDIR=${TINCDIR:-auto}
 SYSHOSTN=${HOSTNAME:-$(hostname)}
 HOSTN=${HOSTN:-$SYSHOSTN}
 NETNAME=${NETNAME:-retiolum}
@@ -241,6 +242,7 @@ if [ $OS -eq 2 ]; then
         exit 1
     else
         TINCBIN=/data/data/org.poirsouille.tinc_gui/files/tincd
+        if [ $TINCDIR == 'auto' ]; then TINCDIR=/usr/local/etc/tinc ;fi
         if [ $TEMPDIR == 'auto' ]; then TEMPDIR=/data/secure/data ;fi
     fi
 else
@@ -249,6 +251,7 @@ else
         exit 1
     else
         TINCBIN=tincd
+        if [ $TINCDIR == 'auto' ]; then TINCDIR=/etc/tinc ;fi
         if [ $TEMPDIR == 'auto' ]; then TEMPDIR=/tmp/tinc-install-fu ;fi
     fi
 fi
@@ -256,16 +259,9 @@ fi
 #generate full subnet information for v4
 
 #test if tinc directory already exists
-if [ $OS -eq 2 ]; then
-    if test -e /usr/local/etc/tinc/$NETNAME; then
-        echo "tinc config directory /usr/local/etc/tinc/$NETNAME does already exist. (backup and) delete config directory and restart"
-        exit 1
-    fi
-else
-    if test -e /etc/tinc/$NETNAME; then
-        echo "tinc config directory /etc/tinc/$NETNAME does already exist. (backup and) delete config directory and restart"
-        exit 1
-    fi
+if test -e $TINCDIR/$NETNAME; then
+    echo "tinc config directory $TINCDIR/$NETNAME does already exist. (backup and) delete config directory and restart"
+    exit 1
 fi
 
 #get tinc-hostfiles
@@ -309,13 +305,8 @@ get_hostname $HOSTN
 
 
 #create the configs
-if [ $OS -eq 2 ];then
-    mkdir -p /usr/local/etc/tinc/$NETNAME
-    cd /usr/local/etc/tinc/$NETNAME
-else
-    mkdir -p /etc/tinc/$NETNAME
-    cd /etc/tinc/$NETNAME
-fi
+mkdir -p $TINCDIR/$NETNAME
+cd $TINCDIR/$NETNAME
 
 mv $TEMPDIR/hosts ./
 rm -r $TEMPDIR
-- 
cgit v1.2.3


From 68f6b9994e4de23228ce6d7aacad5bf182e04654 Mon Sep 17 00:00:00 2001
From: tv <tv@nomic>
Date: Sat, 15 Dec 2012 14:32:17 +0100
Subject: retiolum/hosts/nomic: add /32 to ipv4

---
 retiolum/hosts/nomic | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/retiolum/hosts/nomic b/retiolum/hosts/nomic
index d9604985..f418233c 100644
--- a/retiolum/hosts/nomic
+++ b/retiolum/hosts/nomic
@@ -1,6 +1,5 @@
-Subnet = 10.243.0.110
+Subnet = 10.243.0.110/32
 Subnet = 42:02d5:733f:d6da:c0f5:2bb7:2b18:09ec/128
-
 -----BEGIN RSA PUBLIC KEY-----
 MIIBCgKCAQEAwb8Yk/YRc17g2J9n960p6j4W/l559OPyuMPdGJ4DmCm3WNQtxoa+
 qTFUiDiI85BcmfqnSeddLG8zTC2XnSlIvCRMJ9oKzppFM4PX4OTAaJZVE5WyCQhw
-- 
cgit v1.2.3