From 64bc4d8139e6971d42073be6d75ecdb2c32e69ed Mon Sep 17 00:00:00 2001
From: Felix Richter <Felix.Richter@syntax-fehler.de>
Date: Sat, 9 Apr 2011 03:02:49 +0200
Subject: cleaned up repo,added hosts file (no external deps)

---
 hosts/build_debian    |  11 -----------
 hosts/build_debian.sh |  11 +++++++++++
 hosts/build_ec2.sh    |   0
 hosts/hosts.tar       | Bin 0 -> 20480 bytes
 hosts/install.sh      |   6 ++++--
 5 files changed, 15 insertions(+), 13 deletions(-)
 delete mode 100755 hosts/build_debian
 create mode 100755 hosts/build_debian.sh
 mode change 100644 => 100755 hosts/build_ec2.sh
 create mode 100644 hosts/hosts.tar
 mode change 100644 => 100755 hosts/install.sh

diff --git a/hosts/build_debian b/hosts/build_debian
deleted file mode 100755
index d0f7a27f..00000000
--- a/hosts/build_debian
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -x
-MYIP=10.0.7.7.55
-
-aptitude install liblzo2-dev tinc curl git
-
-git clone https://github.com/makefu/shack-retiolum.git
-
-cd shack-retiolum
-
-./install.sh `hostname` $MYIP
diff --git a/hosts/build_debian.sh b/hosts/build_debian.sh
new file mode 100755
index 00000000..f830a809
--- /dev/null
+++ b/hosts/build_debian.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -x
+MYIP=10.0.7.7.55
+
+aptitude install tinc git
+
+git clone https://github.com/makefu/shack-retiolum.git
+
+cd shack-retiolum
+
+./install.sh `hostname` $MYIP
diff --git a/hosts/build_ec2.sh b/hosts/build_ec2.sh
old mode 100644
new mode 100755
diff --git a/hosts/hosts.tar b/hosts/hosts.tar
new file mode 100644
index 00000000..20966c1a
Binary files /dev/null and b/hosts/hosts.tar differ
diff --git a/hosts/install.sh b/hosts/install.sh
old mode 100644
new mode 100755
index d74636e9..ebff669d
--- a/hosts/install.sh
+++ b/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
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/28300000.lock: Permission denied (13)