diff options
| author | makefu <root@pigstarter.de> | 2013-01-24 02:12:53 +0000 |
|---|---|---|
| committer | makefu <root@pigstarter.de> | 2013-01-24 02:12:53 +0000 |
| commit | c939be138f8c51766032c91c11558e5a79fa15c5 (patch) | |
| tree | b4af661a09f2fc2427a644811f6b4754f254ee0a | |
| parent | 0c1883da9a8667595c528130cb9ddc7b0c4a04b2 (diff) | |
| parent | 14ae58b1f8712c7db98c4b85e18fe632b9dd3a3d (diff) | |
Merge branch 'master' of https://github.com/krebscode/painload
| -rw-r--r-- | retiolum/hosts/seruundroid | 17 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 7 |
2 files changed, 16 insertions, 8 deletions
diff --git a/retiolum/hosts/seruundroid b/retiolum/hosts/seruundroid index 660673fb..b4f0848e 100644 --- a/retiolum/hosts/seruundroid +++ b/retiolum/hosts/seruundroid @@ -1,11 +1,12 @@ -Subnet = 10.243.211.81 -Subnet = 42:d274:9187:9408:d5e7:05f2:ee07:9abd +Subnet = 10.243.127.2 +Subnet = 42:81de:f850:152b:0988:1942:265d:dacb -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAryK+xseuc/kPjZb+uPyNiDDW4P9DVLTV/eGowHZrPcn6t7L5CUZp -jl4csKkfJs8TayM9edAitJvC3KWFmdZrV6L9LY1BmAGuJix4wr1WtdkxwC/cUUWE -I9bTqSTGrhSRxKRmO/xSB1za5oIfIQ6vnXZYXPaAFiOQj4B5m5qn79K+d3N3j3MX -BB8BEkQHNuuCTm3JIWTLT6ZSOGgKPCXnV9NR6WwdHS62SBntZQHaheirMQQ7AJAT -kiZTdrPnMap0Qm9xkMbttazgrfVNoOzCJRMOH5EyMEfc69CufOotgfJLg0Ki8aeJ -uY3wX/aLZz2HklVarvuk5gX5RqsmZXswFwIDAQAB +MIIBCgKCAQEAvNtSbaaacF05L2mAxxA5SYc6DuoZEAkXlhcvLTlpu9f/0vZwUWh7 +175pLn6VqUijVoFb9vyoOwkrs9Uk3aX8mYws+5yJLwXhIje+U3uiVTphowKva+m9 +BzV6waZ5dLbh+3CGimx1TBkFTly3NkdZs886QWSO4aXLdU6lt3jRYsuay0Eop/j0 +eQ0BWg9o0QEcfDRQ7RirXrD0B7TSo6qZC0b4NSAMHTE+dvOMo7c+Z7cIPNLS0B+T +Am7ju3gF7UU68kKPyczrNSPPPZayEvZYUZE4PHt8dyIsppojoRq0SJqsMr/mOC15 +dg/KnoKezn9nqUWzisRWrrqWStAKITJkjQIDAQAB -----END RSA PUBLIC KEY----- + diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 18096e1f..65611b1c 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -166,6 +166,7 @@ if [ $OS -eq 2 ]; then if [ $TINCDIR = 'auto' ]; then TINCDIR="/usr/local/etc/tinc" ;fi if [ $TEMPDIR = 'auto' ]; then TEMPDIR="/storage/sdcard0/tinc-fu" ;fi mount -o remount,rw / + mount -o remount,rw /system DEV="/dev/tun" fi else @@ -305,6 +306,12 @@ else yes | $TINCBIN -n $NETNAME -K fi +if [ $OS -eq 2 ]; then + mkdir /etc/tinc + cd / + mv $TINCDIR/$NETNAME /etc/tinc/ + cd /etc/tinc/$NETNAME +fi #write to irc-channel NICK="${HOSTN}_$(head /dev/urandom | tr -dc "0123456789" | head -c3)" |