From 298546b3ad1686de61fd3a7292cd5bccb0576788 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Sun, 27 Mar 2011 22:20:57 +0200 Subject: added install script --- hosts/install.sh | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 hosts/install.sh diff --git a/hosts/install.sh b/hosts/install.sh new file mode 100644 index 00000000..d347a4c6 --- /dev/null +++ b/hosts/install.sh @@ -0,0 +1,61 @@ +! /bin/sh + +set -e +myname="${1:-dummy}" +netname=retiolum +myipv4="${2:-10.7.7.56}" +mynet4=10.7.7.0 + +# create configuration directory for $netname +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 + + +cat>tinc-up<tinc.conf< hosts/$myname +tincd -n $netname -K + +echo Writing Public Key to irc channel +cat>write_channel.py< Date: Sun, 27 Mar 2011 22:21:14 +0200 Subject: added build script for ec2 tiny instances --- hosts/build_ec2.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 hosts/build_ec2.sh diff --git a/hosts/build_ec2.sh b/hosts/build_ec2.sh new file mode 100644 index 00000000..79f2af28 --- /dev/null +++ b/hosts/build_ec2.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -e +sudo yum install -y gcc openssl-devel +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install -- cgit v1.2.3 From ccf45ce65de2d6c778f180180784313bbae88e00 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Sun, 27 Mar 2011 22:24:59 +0200 Subject: fixed install bug --- hosts/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/install.sh b/hosts/install.sh index d347a4c6..d74636e9 100644 --- a/hosts/install.sh +++ b/hosts/install.sh @@ -1,4 +1,5 @@ -! /bin/sh +#! /bin/sh +# USE WITH GREAT CAUTION set -e myname="${1:-dummy}" -- cgit v1.2.3 From 46c488678a7b03105ce80bf79a1d698388f50e43 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Fri, 8 Apr 2011 22:39:33 +0200 Subject: added debian base install script --- hosts/build_debian | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 hosts/build_debian diff --git a/hosts/build_debian b/hosts/build_debian new file mode 100755 index 00000000..d0f7a27f --- /dev/null +++ b/hosts/build_debian @@ -0,0 +1,11 @@ +#!/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 -- cgit v1.2.3 From 64bc4d8139e6971d42073be6d75ecdb2c32e69ed Mon Sep 17 00:00:00 2001 From: Felix Richter 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<tinc.conf< hosts/$myname -- cgit v1.2.3 From efa6ac62c5a755acb30b193ea2e4a98b59a2a31a Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Sat, 9 Apr 2011 15:54:22 +0200 Subject: added arch build/fixed install script,added no_omo i also added a README file which contains some useful informations about the scripts --- hosts/README | 13 +++++++++++++ hosts/build_arch.sh | 14 ++++++++++++++ hosts/hosts.tar | Bin 20480 -> 20480 bytes hosts/install.sh | 5 +++-- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 hosts/README create mode 100755 hosts/build_arch.sh diff --git a/hosts/README b/hosts/README new file mode 100644 index 00000000..e6ae9454 --- /dev/null +++ b/hosts/README @@ -0,0 +1,13 @@ +This directory contains the build and install scripts for shack-retiolum + +1. build_arch + arch linux build script +2. build_debian + debian build script +3. build_ec2 + Amazon ec2 base instance build script +4. install.sh + configures the tinc daemon + $1 is the nickname + $2 is the ip-address +hosts.tar contains the currently available hosts diff --git a/hosts/build_arch.sh b/hosts/build_arch.sh new file mode 100755 index 00000000..5ef5d765 --- /dev/null +++ b/hosts/build_arch.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +sudo pacman -S openssl gcc lzo +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd .. + +echo "overwriting python to python2" +sed 's/\/usr\/bin\/python/\/usr\/bin\/python2/g' install.sh >install2.sh +mv install2.sh install.sh + diff --git a/hosts/hosts.tar b/hosts/hosts.tar index 20966c1a..8fea5d47 100644 Binary files a/hosts/hosts.tar and b/hosts/hosts.tar differ diff --git a/hosts/install.sh b/hosts/install.sh index ebff669d..c74df03a 100755 --- a/hosts/install.sh +++ b/hosts/install.sh @@ -3,11 +3,12 @@ set -e myname="${1:-dummy}" -hostsfile=`dirname $0`/hosts.tar +rel_hostsfile=`dirname $0`/hosts.tar +hostsfile=`readlink -f $rel_hostsfile` netname=retiolum myipv4="${2:-10.7.7.56}" mynet4=10.7.7.0 - +CURR=`pwd` # create configuration directory for $netname mkdir -p /etc/tinc/$netname cd /etc/tinc/$netname -- cgit v1.2.3 From 59908a00e6d02651d64145450a59a7d76ba3d972 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Sat, 9 Apr 2011 18:37:52 +0200 Subject: added public keys in directory and not tarfile --- README | 13 ++++++++++ build_arch.sh | 14 +++++++++++ build_debian.sh | 11 ++++++++ build_ec2.sh | 16 ++++++++++++ hosts/Lassulus | 9 +++++++ hosts/README | 13 ---------- hosts/also | 9 +++++++ hosts/build_arch.sh | 14 ----------- hosts/build_debian.sh | 11 -------- hosts/build_ec2.sh | 16 ------------ hosts/foobaz | 8 ++++++ hosts/hosts.tar | Bin 20480 -> 0 bytes hosts/install.sh | 65 ----------------------------------------------- hosts/kaah | 11 ++++++++ hosts/krebs | 10 ++++++++ hosts/miefda901 | 9 +++++++ hosts/miefdat | 10 ++++++++ hosts/no_omo | 9 +++++++ hosts/pa_sharepoint | 7 ++++++ hosts/pfleidi | 9 +++++++ hosts/pornocauster | 9 +++++++ hosts/supernode | 10 ++++++++ install.sh | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 23 files changed, 232 insertions(+), 119 deletions(-) create mode 100644 README create mode 100755 build_arch.sh create mode 100755 build_debian.sh create mode 100755 build_ec2.sh create mode 100644 hosts/Lassulus delete mode 100644 hosts/README create mode 100644 hosts/also delete mode 100755 hosts/build_arch.sh delete mode 100755 hosts/build_debian.sh delete mode 100755 hosts/build_ec2.sh create mode 100644 hosts/foobaz delete mode 100644 hosts/hosts.tar delete mode 100755 hosts/install.sh create mode 100644 hosts/kaah create mode 100644 hosts/krebs create mode 100644 hosts/miefda901 create mode 100644 hosts/miefdat create mode 100644 hosts/no_omo create mode 100644 hosts/pa_sharepoint create mode 100644 hosts/pfleidi create mode 100644 hosts/pornocauster create mode 100644 hosts/supernode create mode 100755 install.sh diff --git a/README b/README new file mode 100644 index 00000000..e6ae9454 --- /dev/null +++ b/README @@ -0,0 +1,13 @@ +This directory contains the build and install scripts for shack-retiolum + +1. build_arch + arch linux build script +2. build_debian + debian build script +3. build_ec2 + Amazon ec2 base instance build script +4. install.sh + configures the tinc daemon + $1 is the nickname + $2 is the ip-address +hosts.tar contains the currently available hosts diff --git a/build_arch.sh b/build_arch.sh new file mode 100755 index 00000000..5ef5d765 --- /dev/null +++ b/build_arch.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +sudo pacman -S openssl gcc lzo +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd .. + +echo "overwriting python to python2" +sed 's/\/usr\/bin\/python/\/usr\/bin\/python2/g' install.sh >install2.sh +mv install2.sh install.sh + diff --git a/build_debian.sh b/build_debian.sh new file mode 100755 index 00000000..f830a809 --- /dev/null +++ b/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/build_ec2.sh b/build_ec2.sh new file mode 100755 index 00000000..79f2af28 --- /dev/null +++ b/build_ec2.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -e +sudo yum install -y gcc openssl-devel +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install diff --git a/hosts/Lassulus b/hosts/Lassulus new file mode 100644 index 00000000..61c2d62b --- /dev/null +++ b/hosts/Lassulus @@ -0,0 +1,9 @@ +Subnet = 10.7.7.11 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsj1PCibKOfF68gmFQ+wwyfhUWpqKqpznrJX1dZ+daae7l7nBHvsE +H0QwkiMmk3aZy1beq3quM6gX13aT+/wMfWnLyuvT11T5C9JEf/IS91STpM2BRN+R ++P/DhbuDcW4UsdEe6uwQDGEJbXRN5ZA7GI0bmcYcwHJ9SQmW5v7P9Z3oZ+09hMD+ +1cZ3HkPN7weSdMLMPpUpmzCsI92cXGW0xRC4iBEt1ZeBwjkLCRsBFBGcUMuKWwVa +9sovca0q3DUar+kikEKVrVy26rZUlGuBLobMetDGioSawWkRSxVlfZvTHjAK5JzU +O6y6hj0yQ1sp6W2JjU8ntDHf63aM71dB9QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/README b/hosts/README deleted file mode 100644 index e6ae9454..00000000 --- a/hosts/README +++ /dev/null @@ -1,13 +0,0 @@ -This directory contains the build and install scripts for shack-retiolum - -1. build_arch - arch linux build script -2. build_debian - debian build script -3. build_ec2 - Amazon ec2 base instance build script -4. install.sh - configures the tinc daemon - $1 is the nickname - $2 is the ip-address -hosts.tar contains the currently available hosts diff --git a/hosts/also b/hosts/also new file mode 100644 index 00000000..9f9dcd73 --- /dev/null +++ b/hosts/also @@ -0,0 +1,9 @@ +Subnet = 10.7.7.23 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry +Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ +llgUfRETQd/2KaIfJWH/nVsBuK0hp1LscroWcoO08BCw6v94q3He8502Bk/ZYZQF +wD7Y6LldipWKo/K9YtIU3zD3taj2NGnetOc0BRRncSgGiicXJKhtfcs+Ti2Y/ITz +bFkHnFgB0KnhjwJBumxdmgjHWknlwVkROvmzIgyoXxqEw31bF+g/XzA7RTMXsiFM +w0SZ15k4HG5L1PWpUyY2Th5yIjMW+sSrhQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/build_arch.sh b/hosts/build_arch.sh deleted file mode 100755 index 5ef5d765..00000000 --- a/hosts/build_arch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -e -sudo pacman -S openssl gcc lzo -curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz -cd tinc-1.0.13 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -make -sudo make install -cd .. - -echo "overwriting python to python2" -sed 's/\/usr\/bin\/python/\/usr\/bin\/python2/g' install.sh >install2.sh -mv install2.sh install.sh - diff --git a/hosts/build_debian.sh b/hosts/build_debian.sh deleted file mode 100755 index f830a809..00000000 --- a/hosts/build_debian.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/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 deleted file mode 100755 index 79f2af28..00000000 --- a/hosts/build_ec2.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -e -sudo yum install -y gcc openssl-devel -mkdir build -cd build -curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar xz -cd lzo-2.04 -./configure --prefix=/usr -make -sudo make install -cd .. -curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz -cd tinc-1.0.13 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -make -sudo make install diff --git a/hosts/foobaz b/hosts/foobaz new file mode 100644 index 00000000..47ac4d6e --- /dev/null +++ b/hosts/foobaz @@ -0,0 +1,8 @@ +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA4wJHcyS3PI2rugPbhQy5qLKQwtaOIsLV367b9Pq6VLKEly2dWAZx +xvFmdKRbm/n/HaRzX+vyDuhWOxkzrF0NLNrrU58Rw5suHfNU2ryuO1QB2sIGMj1R +QXwB+W6MNM5OamBkLLo740aPvVjfud9tc3yrUg6mTCJP1tbRLgHyDy6DT3s5WGvO +R6bfYRjdzVLjwqqn5P/ED51gBgDmJEhoWzQ4IzBSO+mxRrkvwfPQNiTSrrQBAiU7 +r5lstDzEY8qDdwY6t1w91hxm34LLJ/gQr9uvXGF/GThm4J8Ndlj4tOl8UmFbo3Nz +6Zm0b2JZ4dWbA/NXp7Sf9qKC5duQkAPb1QIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/hosts.tar b/hosts/hosts.tar deleted file mode 100644 index 8fea5d47..00000000 Binary files a/hosts/hosts.tar and /dev/null differ diff --git a/hosts/install.sh b/hosts/install.sh deleted file mode 100755 index c74df03a..00000000 --- a/hosts/install.sh +++ /dev/null @@ -1,65 +0,0 @@ -#! /bin/sh -# USE WITH GREAT CAUTION - -set -e -myname="${1:-dummy}" -rel_hostsfile=`dirname $0`/hosts.tar -hostsfile=`readlink -f $rel_hostsfile` -netname=retiolum -myipv4="${2:-10.7.7.56}" -mynet4=10.7.7.0 -CURR=`pwd` -# create configuration directory for $netname -mkdir -p /etc/tinc/$netname -cd /etc/tinc/$netname - -# get currently known hosts -tar xf $hostsfile - - -cat>tinc-up<tinc.conf< hosts/$myname -tincd -n $netname -K - -echo Writing Public Key to irc channel -cat>write_channel.py<tinc-up<tinc.conf< hosts/$myname +tincd -n $netname -K + +echo Writing Public Key to irc channel +cat>write_channel.py< Date: Fri, 15 Apr 2011 22:38:50 +0200 Subject: added tart --- hosts/tart | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 hosts/tart diff --git a/hosts/tart b/hosts/tart new file mode 100644 index 00000000..986140ee --- /dev/null +++ b/hosts/tart @@ -0,0 +1,6 @@ +Subnet = 10.7.7.123 +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBALvZ4rLz0soCzkyOraC1aKtJzfVqYd2je6rkuaV12CLybCUc6YXaW/HP +rzJyDGmdh355kU4FNNyjnWP/U/juhMaeYFyTUWCRVXdqvDdeiEe/EJ0g+fFGKvPY +DEFo3VMCEkrXKuwDBQP02b4xmAWWnVBityGv5tgDFjl9uXh/SzL1AgMBAAE= +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 34b3b5c50fab2c177c7772df6207489ed038d474 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Fri, 22 Apr 2011 13:36:46 +0200 Subject: updated supernode, added alphalabs --- hosts/alphalabs | 9 +++++++++ hosts/supernode | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 hosts/alphalabs diff --git a/hosts/alphalabs b/hosts/alphalabs new file mode 100644 index 00000000..6aea1dec --- /dev/null +++ b/hosts/alphalabs @@ -0,0 +1,9 @@ +Subnet = 10.7.7.10 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvUAbMmmOFn+4kOvJAvmi0R/XCQa1YBlkjUvC6Pmt0Q8gV1DodXjB +DgwP8yhLcxaVy2Hk82aJvNTUrfMeB2sdt1RJHQiEPQkHthdp8Spm0Px4uTiMjmFB +ev91xi00eCCGIKsXdh/qso1K7EDHt9MEVHOvSlkawWzoyJ6AaHStW1ElwDdGjZpl +0YWrhx4Gk5X7pCp3LKkQJFfGtqoqGOVg2JjqK3qMsAdRo6QvYDqjFzARed/D0k55 +kcKXjBJAVxoU/CqGfS/Lr0fL8tdYgXaAXvPO9dbr1t0KyOUY2KRNBePeSvRp/etb +H0LBPsO9F7PQiPI3DBoWCYgsuj/hBXapvwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/supernode b/hosts/supernode index f60228f9..5cee4e32 100644 --- a/hosts/supernode +++ b/hosts/supernode @@ -1,4 +1,4 @@ -Address = 81.20.134.84 +Address = 46.252.21.5 Subnet = 10.7.7.1 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -- cgit v1.2.3 From 73859a0ca8a59bbb8ee306ed32642aed5dd25497 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Fri, 22 Apr 2011 13:42:28 +0200 Subject: added miefdahome --- hosts/miefdahome | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hosts/miefdahome diff --git a/hosts/miefdahome b/hosts/miefdahome new file mode 100644 index 00000000..9a9f4310 --- /dev/null +++ b/hosts/miefdahome @@ -0,0 +1,9 @@ +Subnet = 10.7.7.30 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAopwKn000XAcoI61OqQ7cjgrPHm/jHmuB1LHeCUggWMOD78WDFNzq +8/l9ASlU9kbSZFhoMuBR5BPWgciYWsC1EqY1nRAc/Si1rUHnJw+Xcyl0MNsZ7Cef +WaFRvC1VNC3qlQp5/e+fi46oOp4i+BqlFSxe7Jrr0EVyBVTOw8rMGToqDsOih6M9 +SFvmVMOnqh7n8LEOUtAL4nID59k7CTXzoNhXc0cEJoBkC2YCexonb4ru/J8F2BRG +Y3yzHYVskBrrPie1JNhfUHGCABIbtODTiHQYH8NFTYzdBnVV88IWqiTBbmKcRf+j +zEyGyXu/3YLFfjmsi7ysT+BWLIPvkyr7/wIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From f56ae51c2260607947f77c8df207f2fa134fef7a Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Mon, 2 May 2011 02:14:59 +0200 Subject: updated debian installer for autostart,no.de installer(nonfunct) --- build_debian.sh | 5 +++++ build_no.de.sh | 1 + 2 files changed, 6 insertions(+) create mode 100644 build_no.de.sh diff --git a/build_debian.sh b/build_debian.sh index f830a809..ecec41a3 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -4,8 +4,13 @@ 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 + +# for autostart +echo "retiolum" >> /etc/tinc/nets.boot +echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc diff --git a/build_no.de.sh b/build_no.de.sh new file mode 100644 index 00000000..2976d3a2 --- /dev/null +++ b/build_no.de.sh @@ -0,0 +1 @@ +pkgin in lzo gcc-tools gcc-compiler gcc34 -- cgit v1.2.3 From b678653ff59b94b12cfddd723692af62b38a395e Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Thu, 5 May 2011 00:27:40 +0200 Subject: updated to work with legacy os build_debian.sh: updated to work with legacy build_debian_clean.sh: debian build script with manual compiling install.sh: updated python to work with legacy software --- build_debian.sh | 6 +++--- build_debian_clean.sh | 31 +++++++++++++++++++++++++++++++ install.sh | 8 ++++---- 3 files changed, 38 insertions(+), 7 deletions(-) create mode 100755 build_debian_clean.sh diff --git a/build_debian.sh b/build_debian.sh index ecec41a3..3f21ec6e 100755 --- a/build_debian.sh +++ b/build_debian.sh @@ -2,8 +2,7 @@ set -x MYIP=10.0.7.7.55 -aptitude install tinc git - +apt-get install tinc git curl python git clone https://github.com/makefu/shack-retiolum.git @@ -11,6 +10,7 @@ cd shack-retiolum ./install.sh `hostname` $MYIP +rm shack-retiolum # for autostart echo "retiolum" >> /etc/tinc/nets.boot -echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc +echo "EXTRA=\"\"" >> /etc/default/tinc diff --git a/build_debian_clean.sh b/build_debian_clean.sh new file mode 100755 index 00000000..a7332f4e --- /dev/null +++ b/build_debian_clean.sh @@ -0,0 +1,31 @@ +#!/bin/bash +set -xe +MYIP=10.0.7.7.55 + +apt-get install tinc git curl gcc gcc-dev build-essential libssl-dev python + +git clone https://github.com/makefu/shack-retiolum.git + +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar +xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd ../.. + +cd shack-retiolum +./install.sh `hostname` $MYIP + +rm shack-retiolum +# for autostart +echo "retiolum" >> /etc/tinc/nets.boot +echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc diff --git a/install.sh b/install.sh index 5fa1d4a5..af461a30 100755 --- a/install.sh +++ b/install.sh @@ -47,7 +47,7 @@ CHANNEL = '#tincspasm' HOST='irc.freenode.net' FILE="/etc/tinc/retiolum/hosts/$myname" PORT=6667 -NICK= "$myname"+str(random.randint(23,666)) +NICK= "$myname_"+str(random.randint(23,666)) sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM) sock.connect((HOST,PORT)) @@ -56,9 +56,9 @@ sock.send("NICK %s\r\n" % NICK) sock.send("USER %s %s bla : %s\r\n" %(NICK,HOST,NICK)) sock.send("JOIN %s\r\n" % CHANNEL) time.sleep(23) -with open(FILE,'r') as f: - a = [ sock.send("PRIVMSG %s : %s" % ( CHANNEL,line)) for line in f] - time.sleep(5) #because irc is so lazy +f = open(FILE,'r') +a = [ sock.send("PRIVMSG %s : %s" % ( CHANNEL,line)) for line in f] +time.sleep(5) #because irc is so lazy print "closing socket" sock.close() EOF -- cgit v1.2.3 From a658f9efc524418ce4e6299e410698317440d200 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Tue, 10 May 2011 13:42:00 +0200 Subject: added ITART,UTART,ytart --- hosts/ITART | 6 ++++++ hosts/UTART | 9 +++++++++ hosts/ytart | 9 +++++++++ 3 files changed, 24 insertions(+) create mode 100644 hosts/ITART create mode 100644 hosts/UTART create mode 100644 hosts/ytart diff --git a/hosts/ITART b/hosts/ITART new file mode 100644 index 00000000..953c0995 --- /dev/null +++ b/hosts/ITART @@ -0,0 +1,6 @@ +Subnet = 10.7.7.22 +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBANihbPlgirJ63MpMX283M+SjW6JgEhXmt1zcRuOyunbUq6Yt+w4sVtN8 +n2dZ960cTnAXkM1mvMhIcI5p6ZwfdorThJV2+F9eb+84x3GiDLTZ2eL0UefxOSLG +OILFFu5t4Y82MCreyHV4GZDrb2Sz0L1t6r8DmyU91MjXkYBLq5g/AgMBAAE= +-----END RSA PUBLIC KEY----- diff --git a/hosts/UTART b/hosts/UTART new file mode 100644 index 00000000..43cd213a --- /dev/null +++ b/hosts/UTART @@ -0,0 +1,9 @@ +Subnet = 10.7.7.66 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA1tFgR6xxNZavtG44QEAEzKQixJqO9MuO5hUcklH87Sml+Mz+Ptz/ +r8Vhmvc1NhL0d8h1VJSrzjAyYuBR0LKSGRYxHby/M9AqBjUHUhDM83ogV/CbSifs +TlBcKuvPkGVALN6LYcPXjzKzBI7X1ictqts9K3CoCWgjRld63noczvNnwVdHNawX +ckQdjzxMAgwtJW0hWfDr1Uhq3sVEFnHLzFJuLsnc6gDzKvP/ETQ6KINv43B9UerS +HzFK3ntViohW4K/p6i4gBNxFfYnuNLqnY+O/hc0/fFdKE36eLD8ngPURo3/As6Le +KlPEMBwIIJQpS7GP4BIUK/qPE9J7McU6wQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/ytart b/hosts/ytart new file mode 100644 index 00000000..9f45cd2f --- /dev/null +++ b/hosts/ytart @@ -0,0 +1,9 @@ +Subnet = 10.7.7.201 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA2yCCN8nAPmZNL75Jr+FtfP5jmyuqg7IpgfW03L3s8Gg7NB1eTQAg +UFPh13cj4lZleZOl3Yus7yx4HxMO8tYCptqnRPyP+UXrxvL+kECS4J3rLzjH/eOM +0oAxuEe+DOa5R9Vj2bRtTouePlEvXDpgZZcDnedutRUYFGLNvkoWxu0RGqfQaJmd +7KtOk1NJn9efNqwpl6ejPj5A+ivh2T1vAMWherM60JTjjhNGiSP4so0WG8PlBPYc +GKnmMSQl0u5n10uTvLoVvnSfLj/QvL3d8abTrFV2lRqaCTJy+lxgkS1A5AnsTP1G +OBbm/Gk9hRuYy2iP6FQ65q64/JfoeoqpPwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From b54e30f1d4b37f9b01be4434d6b03e6301c46e14 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Tue, 10 May 2011 21:05:33 +0200 Subject: 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) --- README | 13 ------- build_arch.sh | 14 -------- build_debian.sh | 16 --------- build_debian_clean.sh | 31 ---------------- build_ec2.sh | 16 --------- build_no.de.sh | 1 - hosts/.scripts/README | 15 ++++++++ hosts/.scripts/build_arch.sh | 14 ++++++++ hosts/.scripts/build_debian.sh | 18 ++++++++++ hosts/.scripts/build_debian_clean.sh | 31 ++++++++++++++++ hosts/.scripts/build_ec2.sh | 16 +++++++++ hosts/.scripts/build_no.de.sh | 1 + hosts/.scripts/install.sh | 68 ++++++++++++++++++++++++++++++++++++ install.sh | 68 ------------------------------------ 14 files changed, 163 insertions(+), 159 deletions(-) delete mode 100644 README delete mode 100755 build_arch.sh delete mode 100755 build_debian.sh delete mode 100755 build_debian_clean.sh delete mode 100755 build_ec2.sh delete mode 100644 build_no.de.sh create mode 100644 hosts/.scripts/README create mode 100755 hosts/.scripts/build_arch.sh create mode 100755 hosts/.scripts/build_debian.sh create mode 100755 hosts/.scripts/build_debian_clean.sh create mode 100755 hosts/.scripts/build_ec2.sh create mode 100644 hosts/.scripts/build_no.de.sh create mode 100755 hosts/.scripts/install.sh delete mode 100755 install.sh diff --git a/README b/README deleted file mode 100644 index e6ae9454..00000000 --- a/README +++ /dev/null @@ -1,13 +0,0 @@ -This directory contains the build and install scripts for shack-retiolum - -1. build_arch - arch linux build script -2. build_debian - debian build script -3. build_ec2 - Amazon ec2 base instance build script -4. install.sh - configures the tinc daemon - $1 is the nickname - $2 is the ip-address -hosts.tar contains the currently available hosts diff --git a/build_arch.sh b/build_arch.sh deleted file mode 100755 index 5ef5d765..00000000 --- a/build_arch.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -set -e -sudo pacman -S openssl gcc lzo -curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz -cd tinc-1.0.13 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -make -sudo make install -cd .. - -echo "overwriting python to python2" -sed 's/\/usr\/bin\/python/\/usr\/bin\/python2/g' install.sh >install2.sh -mv install2.sh install.sh - diff --git a/build_debian.sh b/build_debian.sh deleted file mode 100755 index 3f21ec6e..00000000 --- a/build_debian.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -set -x -MYIP=10.0.7.7.55 - -apt-get install tinc git curl python - -git clone https://github.com/makefu/shack-retiolum.git - -cd shack-retiolum - -./install.sh `hostname` $MYIP - -rm shack-retiolum -# for autostart -echo "retiolum" >> /etc/tinc/nets.boot -echo "EXTRA=\"\"" >> /etc/default/tinc diff --git a/build_debian_clean.sh b/build_debian_clean.sh deleted file mode 100755 index a7332f4e..00000000 --- a/build_debian_clean.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash -set -xe -MYIP=10.0.7.7.55 - -apt-get install tinc git curl gcc gcc-dev build-essential libssl-dev python - -git clone https://github.com/makefu/shack-retiolum.git - -mkdir build -cd build -curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar -xz -cd lzo-2.04 -./configure --prefix=/usr -make -sudo make install -cd .. -curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz -cd tinc-1.0.13 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -make -sudo make install -cd ../.. - -cd shack-retiolum -./install.sh `hostname` $MYIP - -rm shack-retiolum -# for autostart -echo "retiolum" >> /etc/tinc/nets.boot -echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc diff --git a/build_ec2.sh b/build_ec2.sh deleted file mode 100755 index 79f2af28..00000000 --- a/build_ec2.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -set -e -sudo yum install -y gcc openssl-devel -mkdir build -cd build -curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar xz -cd lzo-2.04 -./configure --prefix=/usr -make -sudo make install -cd .. -curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz -cd tinc-1.0.13 -./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var -make -sudo make install diff --git a/build_no.de.sh b/build_no.de.sh deleted file mode 100644 index 2976d3a2..00000000 --- a/build_no.de.sh +++ /dev/null @@ -1 +0,0 @@ -pkgin in lzo gcc-tools gcc-compiler gcc34 diff --git a/hosts/.scripts/README b/hosts/.scripts/README new file mode 100644 index 00000000..8d104179 --- /dev/null +++ b/hosts/.scripts/README @@ -0,0 +1,15 @@ +This directory contains the build and install scripts for shack-retiolum + +1. build_arch + arch linux build script +2. build_debian + debian build script +3. build_debian_clean + debian script which builds a clean tinc daemon +4. build_ec2 + Amazon ec2 base instance build script +5. install.sh + configures the tinc daemon + $1 is the nickname + $2 is the ip-address +hosts.tar contains the currently available hosts diff --git a/hosts/.scripts/build_arch.sh b/hosts/.scripts/build_arch.sh new file mode 100755 index 00000000..5ef5d765 --- /dev/null +++ b/hosts/.scripts/build_arch.sh @@ -0,0 +1,14 @@ +#!/bin/sh +set -e +sudo pacman -S openssl gcc lzo +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd .. + +echo "overwriting python to python2" +sed 's/\/usr\/bin\/python/\/usr\/bin\/python2/g' install.sh >install2.sh +mv install2.sh install.sh + diff --git a/hosts/.scripts/build_debian.sh b/hosts/.scripts/build_debian.sh new file mode 100755 index 00000000..d8fcec2f --- /dev/null +++ b/hosts/.scripts/build_debian.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -x +MYIP=10.0.7.7.55 + +apt-get install tinc git curl python + +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/hosts/.scripts/build_debian_clean.sh b/hosts/.scripts/build_debian_clean.sh new file mode 100755 index 00000000..a7332f4e --- /dev/null +++ b/hosts/.scripts/build_debian_clean.sh @@ -0,0 +1,31 @@ +#!/bin/bash +set -xe +MYIP=10.0.7.7.55 + +apt-get install tinc git curl gcc gcc-dev build-essential libssl-dev python + +git clone https://github.com/makefu/shack-retiolum.git + +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar +xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install +cd ../.. + +cd shack-retiolum +./install.sh `hostname` $MYIP + +rm shack-retiolum +# for autostart +echo "retiolum" >> /etc/tinc/nets.boot +echo "EXTRA=\"--user=tincd --chroot\"" >> /etc/default/tinc diff --git a/hosts/.scripts/build_ec2.sh b/hosts/.scripts/build_ec2.sh new file mode 100755 index 00000000..79f2af28 --- /dev/null +++ b/hosts/.scripts/build_ec2.sh @@ -0,0 +1,16 @@ +#!/bin/sh +set -e +sudo yum install -y gcc openssl-devel +mkdir build +cd build +curl http://www.oberhumer.com/opensource/lzo/download/lzo-2.04.tar.gz | tar xz +cd lzo-2.04 +./configure --prefix=/usr +make +sudo make install +cd .. +curl http://www.tinc-vpn.org/packages/tinc-1.0.13.tar.gz | tar xz +cd tinc-1.0.13 +./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var +make +sudo make install diff --git a/hosts/.scripts/build_no.de.sh b/hosts/.scripts/build_no.de.sh new file mode 100644 index 00000000..2976d3a2 --- /dev/null +++ b/hosts/.scripts/build_no.de.sh @@ -0,0 +1 @@ +pkgin in lzo gcc-tools gcc-compiler gcc34 diff --git a/hosts/.scripts/install.sh b/hosts/.scripts/install.sh new file mode 100755 index 00000000..4b21bcd4 --- /dev/null +++ b/hosts/.scripts/install.sh @@ -0,0 +1,68 @@ +#! /bin/sh +# USE WITH GREAT CAUTION + +set -e +myname="${1:-dummy}" +rel_hostsfile=`dirname $0`/.. +hostsfile=`readlink -f $rel_hostsfile` +netname=retiolum +myipv4="${2:-10.7.7.56}" +mynet4=10.7.7.0 +CURR=`pwd` +# create configuration directory for $netname +mkdir -p /etc/tinc/$netname +cd /etc/tinc/$netname + +# get currently known hosts +cp -r $hostsfile hosts +echo "added known hosts:" +ls -1 | LC_ALL=C sort +echo "delete the nodes you do not trust!" + + +cat>tinc-up<tinc.conf< hosts/$myname +tincd -n $netname -K + +echo Writing Public Key to irc channel +cat>write_channel.py<tinc-up<tinc.conf< hosts/$myname -tincd -n $netname -K - -echo Writing Public Key to irc channel -cat>write_channel.py<