summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Richter <Felix.Richter@syntax-fehler.de>2011-04-09 03:02:49 +0200
committerFelix Richter <Felix.Richter@syntax-fehler.de>2011-04-09 03:02:49 +0200
commitc18d24f4154b9f8bf42162cdc2fe6c89ae6d0f84 (patch)
treeb3eba5575ad6149c9870dc99aa1ecebd1beb7e2a
parentc62114485d4cbe4d8a7b979d22bd53990388eafe (diff)
cleaned up repo,added hosts file (no external deps)
-rwxr-xr-xretiolum/hosts/build_debian.sh (renamed from retiolum/hosts/build_debian)2
-rwxr-xr-x[-rw-r--r--]retiolum/hosts/build_ec2.sh0
-rw-r--r--retiolum/hosts/hosts.tarbin0 -> 20480 bytes
-rwxr-xr-x[-rw-r--r--]retiolum/hosts/install.sh6
4 files changed, 5 insertions, 3 deletions
diff --git a/retiolum/hosts/build_debian b/retiolum/hosts/build_debian.sh
index d0f7a27f..f830a809 100755
--- a/retiolum/hosts/build_debian
+++ b/retiolum/hosts/build_debian.sh
@@ -2,7 +2,7 @@
set -x
MYIP=10.0.7.7.55
-aptitude install liblzo2-dev tinc curl git
+aptitude install tinc git
git clone https://github.com/makefu/shack-retiolum.git
diff --git a/retiolum/hosts/build_ec2.sh b/retiolum/hosts/build_ec2.sh
index 79f2af28..79f2af28 100644..100755
--- a/retiolum/hosts/build_ec2.sh
+++ b/retiolum/hosts/build_ec2.sh
diff --git a/retiolum/hosts/hosts.tar b/retiolum/hosts/hosts.tar
new file mode 100644
index 00000000..20966c1a
--- /dev/null
+++ b/retiolum/hosts/hosts.tar
Binary files differ
diff --git a/retiolum/hosts/install.sh b/retiolum/hosts/install.sh
index d74636e9..ebff669d 100644..100755
--- a/retiolum/hosts/install.sh
+++ b/retiolum/hosts/install.sh
@@ -3,6 +3,7 @@
set -e
myname="${1:-dummy}"
+hostsfile=`dirname $0`/hosts.tar
netname=retiolum
myipv4="${2:-10.7.7.56}"
mynet4=10.7.7.0
@@ -12,8 +13,7 @@ mkdir -p /etc/tinc/$netname
cd /etc/tinc/$netname
# get currently known hosts
-curl http://dl.dropbox.com/u/8729977/hosts.tar | tar vx ||
-curl $GIV_URI_TO_HOSTS_TAR | tar vx
+tar xf $hostsfile
cat>tinc-up<<EOF
@@ -27,6 +27,8 @@ chmod +x tinc-up
cat>tinc.conf<<EOF
Name = $myname
ConnectTo = supernode
+ConnectTo = kaah
+ConnectTo = pa_sharepoint
Device = /dev/net/tun
EOF
echo "Subnet = $myipv4" > hosts/$myname