diff options
author | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-04-09 03:02:49 +0200 |
---|---|---|
committer | Felix Richter <Felix.Richter@syntax-fehler.de> | 2011-04-09 03:02:49 +0200 |
commit | ee087cae17be9bc2a02fcc27c325b214e5497e40 (patch) | |
tree | 2a722d33bf21046f4a41138e3f08b09a8b4380c4 | |
parent | e0fc63028f69ddcca3814de7b35ce343fa10c888 (diff) |
cleaned up repo,added hosts file (no external deps)
-rwxr-xr-x | build_debian.sh (renamed from build_debian) | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | build_ec2.sh | 0 | ||||
-rw-r--r-- | hosts.tar | bin | 0 -> 20480 bytes | |||
-rwxr-xr-x[-rw-r--r--] | install.sh | 6 |
4 files changed, 5 insertions, 3 deletions
diff --git a/build_debian b/build_debian.sh index d0f7a27f..f830a809 100755 --- a/build_debian +++ b/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/build_ec2.sh b/build_ec2.sh index 79f2af28..79f2af28 100644..100755 --- a/build_ec2.sh +++ b/build_ec2.sh diff --git a/hosts.tar b/hosts.tar Binary files differnew file mode 100644 index 00000000..20966c1a --- /dev/null +++ b/hosts.tar diff --git a/install.sh b/install.sh index d74636e9..ebff669d 100644..100755 --- a/install.sh +++ b/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 |