diff options
| author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:05:33 +0200 |
|---|---|---|
| committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-05-10 21:05:33 +0200 |
| commit | b54e30f1d4b37f9b01be4434d6b03e6301c46e14 (patch) | |
| tree | e9cb9d93cdfa86d062e3990a5c50c0b19510d052 | |
| parent | 517f4d882850f2ca1a862a4e82d716234fe6acae (diff) | |
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)
| -rw-r--r-- | hosts/.scripts/README (renamed from README) | 6 | ||||
| -rwxr-xr-x | hosts/.scripts/build_arch.sh (renamed from build_arch.sh) | 0 | ||||
| -rwxr-xr-x | hosts/.scripts/build_debian.sh (renamed from build_debian.sh) | 4 | ||||
| -rwxr-xr-x | hosts/.scripts/build_debian_clean.sh (renamed from build_debian_clean.sh) | 0 | ||||
| -rwxr-xr-x | hosts/.scripts/build_ec2.sh (renamed from build_ec2.sh) | 0 | ||||
| -rw-r--r-- | hosts/.scripts/build_no.de.sh (renamed from build_no.de.sh) | 0 | ||||
| -rwxr-xr-x | hosts/.scripts/install.sh (renamed from install.sh) | 4 |
7 files changed, 9 insertions, 5 deletions
diff --git a/README b/hosts/.scripts/README index e6ae9454..8d104179 100644 --- a/README +++ b/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/build_arch.sh b/hosts/.scripts/build_arch.sh index 5ef5d765..5ef5d765 100755 --- a/build_arch.sh +++ b/hosts/.scripts/build_arch.sh diff --git a/build_debian.sh b/hosts/.scripts/build_debian.sh index 3f21ec6e..d8fcec2f 100755 --- a/build_debian.sh +++ b/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/build_debian_clean.sh b/hosts/.scripts/build_debian_clean.sh index a7332f4e..a7332f4e 100755 --- a/build_debian_clean.sh +++ b/hosts/.scripts/build_debian_clean.sh diff --git a/build_ec2.sh b/hosts/.scripts/build_ec2.sh index 79f2af28..79f2af28 100755 --- a/build_ec2.sh +++ b/hosts/.scripts/build_ec2.sh diff --git a/build_no.de.sh b/hosts/.scripts/build_no.de.sh index 2976d3a2..2976d3a2 100644 --- a/build_no.de.sh +++ b/hosts/.scripts/build_no.de.sh diff --git a/install.sh b/hosts/.scripts/install.sh index af461a30..4b21bcd4 100755 --- a/install.sh +++ b/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!" |