diff options
| -rw-r--r-- | .scripts/README (renamed from README) | 6 | ||||
| -rwxr-xr-x | .scripts/build_arch.sh (renamed from build_arch.sh) | 0 | ||||
| -rwxr-xr-x | .scripts/build_debian.sh (renamed from build_debian.sh) | 4 | ||||
| -rwxr-xr-x | .scripts/build_debian_clean.sh (renamed from build_debian_clean.sh) | 0 | ||||
| -rwxr-xr-x | .scripts/build_ec2.sh (renamed from build_ec2.sh) | 0 | ||||
| -rw-r--r-- | .scripts/build_no.de.sh (renamed from build_no.de.sh) | 0 | ||||
| -rwxr-xr-x | .scripts/install.sh (renamed from install.sh) | 4 | ||||
| -rw-r--r-- | ITART (renamed from hosts/ITART) | 0 | ||||
| -rw-r--r-- | Lassulus (renamed from hosts/Lassulus) | 0 | ||||
| -rw-r--r-- | UTART (renamed from hosts/UTART) | 0 | ||||
| -rw-r--r-- | alphalabs (renamed from hosts/alphalabs) | 0 | ||||
| -rw-r--r-- | also (renamed from hosts/also) | 0 | ||||
| -rw-r--r-- | foobaz (renamed from hosts/foobaz) | 0 | ||||
| -rw-r--r-- | kaah (renamed from hosts/kaah) | 0 | ||||
| -rw-r--r-- | krebs (renamed from hosts/krebs) | 0 | ||||
| -rw-r--r-- | miefda901 (renamed from hosts/miefda901) | 0 | ||||
| -rw-r--r-- | miefdahome (renamed from hosts/miefdahome) | 0 | ||||
| -rw-r--r-- | miefdat (renamed from hosts/miefdat) | 0 | ||||
| -rw-r--r-- | no_omo (renamed from hosts/no_omo) | 0 | ||||
| -rw-r--r-- | pa_sharepoint (renamed from hosts/pa_sharepoint) | 0 | ||||
| -rw-r--r-- | pfleidi (renamed from hosts/pfleidi) | 0 | ||||
| -rw-r--r-- | pornocauster (renamed from hosts/pornocauster) | 0 | ||||
| -rw-r--r-- | supernode (renamed from hosts/supernode) | 0 | ||||
| -rw-r--r-- | tart (renamed from hosts/tart) | 0 | ||||
| -rw-r--r-- | ytart (renamed from hosts/ytart) | 0 |
25 files changed, 9 insertions, 5 deletions
diff --git a/README b/.scripts/README index e6ae9454..8d104179 100644 --- a/README +++ b/.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/build_arch.sh b/.scripts/build_arch.sh index 5ef5d765..5ef5d765 100755 --- a/build_arch.sh +++ b/.scripts/build_arch.sh diff --git a/build_debian.sh b/.scripts/build_debian.sh index 3f21ec6e..d8fcec2f 100755 --- a/build_debian.sh +++ b/.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/build_debian_clean.sh b/.scripts/build_debian_clean.sh index a7332f4e..a7332f4e 100755 --- a/build_debian_clean.sh +++ b/.scripts/build_debian_clean.sh diff --git a/build_ec2.sh b/.scripts/build_ec2.sh index 79f2af28..79f2af28 100755 --- a/build_ec2.sh +++ b/.scripts/build_ec2.sh diff --git a/build_no.de.sh b/.scripts/build_no.de.sh index 2976d3a2..2976d3a2 100644 --- a/build_no.de.sh +++ b/.scripts/build_no.de.sh diff --git a/install.sh b/.scripts/install.sh index af461a30..4b21bcd4 100755 --- a/install.sh +++ b/.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/hosts/Lassulus b/Lassulus index 61c2d62b..61c2d62b 100644 --- a/hosts/Lassulus +++ b/Lassulus diff --git a/hosts/alphalabs b/alphalabs index 6aea1dec..6aea1dec 100644 --- a/hosts/alphalabs +++ b/alphalabs diff --git a/hosts/miefda901 b/miefda901 index a1b59a29..a1b59a29 100644 --- a/hosts/miefda901 +++ b/miefda901 diff --git a/hosts/miefdahome b/miefdahome index 9a9f4310..9a9f4310 100644 --- a/hosts/miefdahome +++ b/miefdahome diff --git a/hosts/pa_sharepoint b/pa_sharepoint index 384a7c22..384a7c22 100644 --- a/hosts/pa_sharepoint +++ b/pa_sharepoint diff --git a/hosts/pornocauster b/pornocauster index eee28777..eee28777 100644 --- a/hosts/pornocauster +++ b/pornocauster diff --git a/hosts/supernode b/supernode index 5cee4e32..5cee4e32 100644 --- a/hosts/supernode +++ b/supernode |