diff options
| author | euer <root@euer.krebsco.de> | 2012-12-22 03:08:01 +0100 |
|---|---|---|
| committer | euer <root@euer.krebsco.de> | 2012-12-22 03:08:01 +0100 |
| commit | 056ec241c0fbeedb6fbda9897a9c0042ce0eb739 (patch) | |
| tree | 0230f2d7d6b7ffdcb4291c84eaffa46b50083fd2 /retiolum | |
| parent | 5176621efd96a793a5d67fcfc4136cc5301405d2 (diff) | |
| parent | 164ff3e48946747fef3b61c4f7dbc143693192c1 (diff) | |
Merge branch 'master' of github.com:krebscode/painload
Diffstat (limited to 'retiolum')
| -rwxr-xr-x | retiolum/openwrt/tinc-up | 19 | ||||
| -rwxr-xr-x | retiolum/openwrt/updater | 6 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 5 |
3 files changed, 3 insertions, 27 deletions
diff --git a/retiolum/openwrt/tinc-up b/retiolum/openwrt/tinc-up deleted file mode 100755 index 3b8bb978..00000000 --- a/retiolum/openwrt/tinc-up +++ /dev/null @@ -1,19 +0,0 @@ -# source: krebscode/painload/retiolum/scripts/tinc_setup/tinc-up - -dirname="`dirname "$0"`" - -conf=$dirname/tinc.conf - -name=`sed -n 's|^ *Name *= *\([^ ]*\) *$|\1|p' $conf` - -host=$dirname/hosts/$name - -addr4=`sed -n 's|^ *Subnet *= *\(10[.][^ ]*\) *$|\1|p' $host` -if [ "$addr4" != '' ];then - ifconfig $INTERFACE $addr4 - route add -net 10.243.0.0 netmask 255.255.0.0 dev retiolum -else - addr4=`sed -n 's|^ *Subnet *= *\(42[.][^ ]*\) *$|\1|p' $host` - ifconfig $INTERFACE $addr4 - route add -net 42.0.0.0 netmask 255.0.0.0 dev retiolum -fi diff --git a/retiolum/openwrt/updater b/retiolum/openwrt/updater deleted file mode 100755 index 4dbc7d78..00000000 --- a/retiolum/openwrt/updater +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -cd /etc/tinc/retiolum/hosts -wget http://vpn.miefda.org/hosts.tar.gz -tar xzf hosts.tar.gz -rm hosts.tar.gz -tincd -n retiolum -kHUP diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index adc355bd..1227912e 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -121,7 +121,7 @@ get_hostname() #os autodetection find_os() { - if grep -qei 'linux' /etc/*release 2>/dev/null; then + if grep -qe 'Linux' /etc/*release 2>/dev/null; then OS=1 elif which getprop&>/dev/null; then OS=2 @@ -310,7 +310,8 @@ mkdir -p $TINCDIR/$NETNAME cd $TINCDIR/$NETNAME if [ $OS -eq 3 ]; then - $LOADER http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C $TINCDIR/$NETNAME/hosts/ + mkdir hosts + $LOADER http://euer.krebsco.de/retiolum/supernodes.tar.gz | tar xz -C hosts/ else mv $TEMPDIR/hosts ./ fi |