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 (limited to 'hosts') 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 (limited to 'hosts') 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(-) (limited to 'hosts') 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 (limited to 'hosts') 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 (limited to 'hosts') 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 (limited to 'hosts') 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 --- 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 ++++++++ 18 files changed, 110 insertions(+), 119 deletions(-) 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 (limited to 'hosts') 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< 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 (limited to 'hosts') 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 (limited to 'hosts') 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 (limited to 'hosts') 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 7be204546483747ce2896049861a087989ce7c04 Mon Sep 17 00:00:00 2001 From: miefda Date: Thu, 5 May 2011 16:00:36 +0200 Subject: initial commit by supernode --- hosts/5eruun | 9 +++++++++ hosts/Lassulus | 9 +++++++++ hosts/alphalabs | 9 +++++++++ hosts/also | 9 +++++++++ hosts/kaah | 11 +++++++++++ hosts/krebs | 9 +++++++++ hosts/miefda901 | 9 +++++++++ hosts/miefdahome | 11 +++++++++++ hosts/miefdat | 10 ++++++++++ hosts/no_omo | 9 +++++++++ hosts/pa_sharepoint | 7 +++++++ hosts/pfleidi | 9 +++++++++ hosts/pornocauster | 9 +++++++++ hosts/supernode | 10 ++++++++++ 14 files changed, 130 insertions(+) create mode 100644 hosts/5eruun create mode 100644 hosts/Lassulus create mode 100644 hosts/alphalabs create mode 100644 hosts/also create mode 100644 hosts/kaah create mode 100644 hosts/krebs create mode 100644 hosts/miefda901 create mode 100644 hosts/miefdahome 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 (limited to 'hosts') diff --git a/hosts/5eruun b/hosts/5eruun new file mode 100644 index 00000000..ca28c396 --- /dev/null +++ b/hosts/5eruun @@ -0,0 +1,9 @@ +Subnet = 10.7.7.128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA/YOSX4xEKitiVzIP0xFUKQvC01uKN+KCT2Y7H8MFzowB+GWdVvpl +Ri8TukMF1EYlIZoSIrgPO/SoOFZNvxPa83I6PeN6W830qKpUt3xYMqyuL2ZJw1hv +hsgPWbGXF2yA39mQas9Skf2SNnEJppFpN8mGw449PLhTFmGoR3x3354kgO40zts4 +qqvpMcyTOx+zQhnGBO4KQqftJU1klgCcYUHrN+ql5vq3u6YgMpUIczPnhN6Cnm+j +hys6sTXN/DFcpq6YGXTHSGZO1JTuAyfZHfXXgUtIbW5W03LLtkYcMIiaIafe+qiv +tAs3cZIEKZVp+1fdfypQok6nDPwC1jy8TwIDAQAB +-----END RSA PUBLIC KEY----- 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/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/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/kaah b/hosts/kaah new file mode 100644 index 00000000..d56014fa --- /dev/null +++ b/hosts/kaah @@ -0,0 +1,11 @@ +Address = kaah.ath.cx +Subnet = 10.7.7.21 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAtd9+R7NYs/5LmXoFakuoFzdO/8hy4MMeGjdDqbubKyJmIO/nvQWS +TQns55znLgPIapUtCijxphoQrcTB5LijVXFj/2uipqiOJHVmhA80NiQgYhrFG++x +9AQie2c04xqq+6Bptjs8vnQS6odLsBAiY1OJDpaEPZqzrpSMnYzEwPWqOAzzbVRd +SFDokIhm62xmDK0+M4H8l3zmMnInnxdHd0fMhBJr5lXXqdzXJ3zluU6fZyHysF4c +OnvFrGNrc3MPpgmzULVUUVg+Z4NeQYa5LuhXA9xia0R5d8ALCi34L4tAvCfSi1Lu +RSUiJHeWDvNzwIy9+hxofqqcJqA05kyGLQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/krebs b/hosts/krebs new file mode 100644 index 00000000..5c832b42 --- /dev/null +++ b/hosts/krebs @@ -0,0 +1,9 @@ +Subnet = 10.7.7.156 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAl6vUmUL8w8r2gUTpUF8QWx0U3nzDPao2I7l0WU1NnGcR8DVug7YN +595guvDkRGcM4eYGizgVYVvDCmjTQRXRn57ucVud2bGE1NGtdomVs6wggpgzLiaf +m9BJwsigoCyMv+8ewGfc+D10TupulcIiZSp/RAewYlX0rhmgdsEGnCt+TWvXRsIa +kY1pvt4YeKjs2ctib3OmaPuNokK4ophxSpdZ5arjHCaiVMj2O6pPAQbU7WFY63Fw +UP64cAmtqBM+uMteT7bdG1jT3KZS6W7Dy8rIBd+pp+vB656A5PhrDcGEUMFSXqPD +BwIxhV7OAejSn4XjrZyd5eNtMOQKopIMQwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/miefda901 b/hosts/miefda901 new file mode 100644 index 00000000..a1b59a29 --- /dev/null +++ b/hosts/miefda901 @@ -0,0 +1,9 @@ +Subnet = 10.7.7.22 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEApbEYmHf0vEDYa/2aVvWVxEGgC+JJlXcArdxkQooSIpnZfSAfsH0S +MFz8v7UkM7EJSwDsFWf+gxyoAORdFpdQm+XQoDqWVZ1e0isYtNluP2C/51s3lu2F +kVLZ+86el7zd4unHG+6CHmyaBcO5yV6VU8WFeuinB2+ojnujOWlHgOipMOrxsab8 +vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h +Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN +VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/miefdahome b/hosts/miefdahome new file mode 100644 index 00000000..180bbde7 --- /dev/null +++ b/hosts/miefdahome @@ -0,0 +1,11 @@ +Address = 192.168.10.119 +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----- diff --git a/hosts/miefdat b/hosts/miefdat new file mode 100644 index 00000000..43e2a6e6 --- /dev/null +++ b/hosts/miefdat @@ -0,0 +1,10 @@ +Subnet = 10.7.7.20 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvCestFRcrr10nzSzc1l4Flkv6ZG5ijGneZBeDaP+bB3GhFx0BYzP +CQjcCFTcExVVAorknjX1/rjT60+dSBuJoH/pEeloPowtwm6YVgfhcQD/5qRHmAPF +Ss1pdiTVtyi0BmcqDGoOTcR/tR4v2LBEDnxK89wWIFWbeDeR6UyjD2psbFBal8Zd +TmkuBTg1OGPVhB+BmuKSqPBt6AtLV+0fKHdrTOVNwF2W/8lCVTd3uCVtnUEeTLrW +KA8h9C0K2gAxxhJTF3pJtR/YQPpgwXRg3CfzMKsvHNOsqfMnnk/WFM0vrSJSi2El +xCD5Pm/BPZyA8B4vhz8im4hWofOP2/JiNwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/no_omo b/hosts/no_omo new file mode 100644 index 00000000..f2398f18 --- /dev/null +++ b/hosts/no_omo @@ -0,0 +1,9 @@ +Subnet = 10.7.7.111 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuHQEeowvxRkoHJUw6cUp431pnoIy4MVv7kTLgWEK46nzgZtld9LM +ZdNMJB9CuOVVMHEaiY6Q5YchUmapGxwEObc0y+8zQxTPw3I4q0GkSJqKLPrsTpkn +sgEkHPfs2GVdtIBXDn9I8i5JsY2+U8QF8fbIQSOO08/Vpa3nknDAMege9yEa3NFm +s/+x+2pS+xV6uzf/H21XNv0oufInXwZH1NCNXAy5I2V6pz7BmAHilVOGCT7g2zn6 +GasmofiYEnro4V5s8gDlQkb7bCZEIA9EgX/HP6fZJQezSUHcDCQFI0vg26xywbr6 +5+9tTn8fN2mWS5+Pdmx3haX1qFcBP5HglwIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/pa_sharepoint b/hosts/pa_sharepoint new file mode 100644 index 00000000..384a7c22 --- /dev/null +++ b/hosts/pa_sharepoint @@ -0,0 +1,7 @@ +Address = pa-sharepoint.informatik.ba-stuttgart.de +Subnet = 10.7.7.5 +-----BEGIN RSA PUBLIC KEY----- +MIGJAoGBAKSle+5vi8j+auGIC41PwFRPdzuyhP/paAEht+9mWpTYYC1meyPDwQR8 +EPNLwj1ccjsAvhubfaDmI3B13cBQx5q1BbTCK81Y5RS1tj384kvAabJAtKsz3aIg +1hWXjiDJUGNpQhKsD7IIg4lkkDcgOBAbdtXlynCQXdQL+YjLTavBAgMBAAE= +-----END RSA PUBLIC KEY----- diff --git a/hosts/pfleidi b/hosts/pfleidi new file mode 100644 index 00000000..416658cf --- /dev/null +++ b/hosts/pfleidi @@ -0,0 +1,9 @@ +Subnet = 10.7.7.177 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwdoS19bbKmVncJcf+uT5nNpyuR8SL9ekd+XMoKBpoqDf0r7ap3F2 +HLNI82NSbSAA4zdASrfrDl75sJ05VIIsueNAwMkFc72YNA9CPBFGcvCNVi0d4XcC +t6voNrgCVaxT77MVBAnohT7+HfYmkTTSrLaDKusRx7ybz6ZaRO9i2peC2VWKVIjP +m3QlvPeTpIJg/nGEBNO3rotBPxpMEB+fJnWxfBHRlt9klK3VhLaXCLUt5KcJ2SA4 +q3BFQbptUfI+d6OSA9btJerdtZ3PVBqlIJ45b3RDUWMborVg6jQ7S4WBzARe1eKs +SHHk0aR5LoiSGiNVGTDlxLVe1UT1dF8voQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/pornocauster b/hosts/pornocauster new file mode 100644 index 00000000..eee28777 --- /dev/null +++ b/hosts/pornocauster @@ -0,0 +1,9 @@ +Subnet = 10.7.7.42 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAnztrijsfao+fmNtwAjqwIDKsRaMP3ECsq2T2zqKvxwCyXk69G9bG +RFhWjgaawS9ZhnHSlgWK/vtoR0O9NxpzdU/mvdQijbVGxM02DegjO9qDSIe8EGmA +kscW4nDqYtw4rtjOVPfnNiWXbcWD8eiYR0kcSWmSvfOpVvdhTETqduTx5HRHyEFD +JRQYR/tJSvVWXmM670PENAPNJFJ4VSJR60s5A+bFT7J/uw7HzJXX28LygJz73Dj2 +2a4ev0WcZQngLq072h/91R/TOpg+ogUDVhXkQtKyFj7im0287JTL4bXGofZBhzaf ++h9dFGs1QLoNyhG/cgt9fog7boSXTelAiQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/hosts/supernode b/hosts/supernode new file mode 100644 index 00000000..5cee4e32 --- /dev/null +++ b/hosts/supernode @@ -0,0 +1,10 @@ +Address = 46.252.21.5 +Subnet = 10.7.7.1 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP +sShYqqN9Aj3iCqj/DHx5jGuSqjyTmmFWIOMM9IwKMo2Oiz/PcBM56N6gzIHuR5wj ++0bV0NRhePD2Tqo3zsEly9Hxw7xmz8azm5l4GcyOtgdRV7R1T3j/jB/9Kv2sj2Y7 +1zhSedCxjt/+NosiZZGE2JhLjzMgsCZSroAIKCZ3X/DP81mTTRxibjol82/Qn61I +b7GbuuB7SwjtZ+9xjsExN1JX5+AFuw9a3AkYuKWLpP50YY16/OTPq7flmB/EtK+Z +rrESIYKtX7pJbLc8Ywi0hBL5oPm07q+0BQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From f01c389f3760f920f60aa8c3c4303182f54237bb Mon Sep 17 00:00:00 2001 From: root Date: Sun, 8 May 2011 14:56:54 +0200 Subject: initial commit --- hosts/supernode | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hosts') diff --git a/hosts/supernode b/hosts/supernode index 5cee4e32..7e8d0fd8 100644 --- a/hosts/supernode +++ b/hosts/supernode @@ -1,4 +1,4 @@ -Address = 46.252.21.5 +Address = miefda.org Subnet = 10.7.7.1 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAr3DlBmQxP9UTBCkohK8FCYSk2td4Ov5lQYvC3Adx04lEWHfp+0nP -- cgit v1.2.3 From d2d60cb61b4cba7eff38483b2f5d75b0fa228445 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 9 May 2011 15:56:54 +0200 Subject: testing --- hosts/miefda901 | 1 + 1 file changed, 1 insertion(+) (limited to 'hosts') diff --git a/hosts/miefda901 b/hosts/miefda901 index a1b59a29..1fd4a063 100644 --- a/hosts/miefda901 +++ b/hosts/miefda901 @@ -7,3 +7,4 @@ vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB -----END RSA PUBLIC KEY----- +#test -- cgit v1.2.3 From ac298f64174c94f949bcdbe342e427a4bc22940c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 9 May 2011 15:58:02 +0200 Subject: undone test settinundone test settingg --- hosts/miefda901 | 1 - 1 file changed, 1 deletion(-) (limited to 'hosts') diff --git a/hosts/miefda901 b/hosts/miefda901 index 1fd4a063..a1b59a29 100644 --- a/hosts/miefda901 +++ b/hosts/miefda901 @@ -7,4 +7,3 @@ vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQnvsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7h Bv6prIxCbpY7WMMtg0z+OlyGkQefVRl18kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnN VoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4nwIDAQAB -----END RSA PUBLIC KEY----- -#test -- 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 (limited to 'hosts') 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 97c8c9bc76aa4cfacf11a59013b7906d167ec3d5 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 10 May 2011 16:37:49 +0200 Subject: UTART: initial commit --- hosts/UTART | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hosts/UTART (limited to 'hosts') 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----- -- cgit v1.2.3 From e866fb311c95910ad0bcde8bfc09f1d12d15e002 Mon Sep 17 00:00:00 2001 From: miefda Date: Tue, 10 May 2011 19:37:54 +0200 Subject: added pubkeys --- hosts/.pubkeys/5eruun | 9 +++++++++ hosts/.pubkeys/Lassulus | 9 +++++++++ hosts/.pubkeys/alphalabs | 9 +++++++++ hosts/.pubkeys/miefda901 | 9 +++++++++ hosts/.pubkeys/miefdahome | 9 +++++++++ hosts/.pubkeys/miefdat | 9 +++++++++ 6 files changed, 54 insertions(+) create mode 100644 hosts/.pubkeys/5eruun create mode 100644 hosts/.pubkeys/Lassulus create mode 100644 hosts/.pubkeys/alphalabs create mode 100644 hosts/.pubkeys/miefda901 create mode 100644 hosts/.pubkeys/miefdahome create mode 100644 hosts/.pubkeys/miefdat (limited to 'hosts') diff --git a/hosts/.pubkeys/5eruun b/hosts/.pubkeys/5eruun new file mode 100644 index 00000000..ce24501f --- /dev/null +++ b/hosts/.pubkeys/5eruun @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/YOSX4xEKitiVzIP0xFU +KQvC01uKN+KCT2Y7H8MFzowB+GWdVvplRi8TukMF1EYlIZoSIrgPO/SoOFZNvxPa +83I6PeN6W830qKpUt3xYMqyuL2ZJw1hvhsgPWbGXF2yA39mQas9Skf2SNnEJppFp +N8mGw449PLhTFmGoR3x3354kgO40zts4qqvpMcyTOx+zQhnGBO4KQqftJU1klgCc +YUHrN+ql5vq3u6YgMpUIczPnhN6Cnm+jhys6sTXN/DFcpq6YGXTHSGZO1JTuAyfZ +HfXXgUtIbW5W03LLtkYcMIiaIafe+qivtAs3cZIEKZVp+1fdfypQok6nDPwC1jy8 +TwIDAQAB +-----END PUBLIC KEY----- diff --git a/hosts/.pubkeys/Lassulus b/hosts/.pubkeys/Lassulus new file mode 100644 index 00000000..b782f07f --- /dev/null +++ b/hosts/.pubkeys/Lassulus @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsj1PCibKOfF68gmFQ+ww +yfhUWpqKqpznrJX1dZ+daae7l7nBHvsEH0QwkiMmk3aZy1beq3quM6gX13aT+/wM +fWnLyuvT11T5C9JEf/IS91STpM2BRN+R+P/DhbuDcW4UsdEe6uwQDGEJbXRN5ZA7 +GI0bmcYcwHJ9SQmW5v7P9Z3oZ+09hMD+1cZ3HkPN7weSdMLMPpUpmzCsI92cXGW0 +xRC4iBEt1ZeBwjkLCRsBFBGcUMuKWwVa9sovca0q3DUar+kikEKVrVy26rZUlGuB +LobMetDGioSawWkRSxVlfZvTHjAK5JzUO6y6hj0yQ1sp6W2JjU8ntDHf63aM71dB +9QIDAQAB +-----END PUBLIC KEY----- diff --git a/hosts/.pubkeys/alphalabs b/hosts/.pubkeys/alphalabs new file mode 100644 index 00000000..d44083f9 --- /dev/null +++ b/hosts/.pubkeys/alphalabs @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvUAbMmmOFn+4kOvJAvmi +0R/XCQa1YBlkjUvC6Pmt0Q8gV1DodXjBDgwP8yhLcxaVy2Hk82aJvNTUrfMeB2sd +t1RJHQiEPQkHthdp8Spm0Px4uTiMjmFBev91xi00eCCGIKsXdh/qso1K7EDHt9ME +VHOvSlkawWzoyJ6AaHStW1ElwDdGjZpl0YWrhx4Gk5X7pCp3LKkQJFfGtqoqGOVg +2JjqK3qMsAdRo6QvYDqjFzARed/D0k55kcKXjBJAVxoU/CqGfS/Lr0fL8tdYgXaA +XvPO9dbr1t0KyOUY2KRNBePeSvRp/etbH0LBPsO9F7PQiPI3DBoWCYgsuj/hBXap +vwIDAQAB +-----END PUBLIC KEY----- diff --git a/hosts/.pubkeys/miefda901 b/hosts/.pubkeys/miefda901 new file mode 100644 index 00000000..740af30d --- /dev/null +++ b/hosts/.pubkeys/miefda901 @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApbEYmHf0vEDYa/2aVvWV +xEGgC+JJlXcArdxkQooSIpnZfSAfsH0SMFz8v7UkM7EJSwDsFWf+gxyoAORdFpdQ +m+XQoDqWVZ1e0isYtNluP2C/51s3lu2FkVLZ+86el7zd4unHG+6CHmyaBcO5yV6V +U8WFeuinB2+ojnujOWlHgOipMOrxsab8vwcH/0k/iR9BjH9xzo+kwhzqG0plLkQn +vsvVyDN/gQj0Euz6YHfgo5c2gxQKKH7hBv6prIxCbpY7WMMtg0z+OlyGkQefVRl1 +8kZwoNtOFlh5NBe7imYcH+wyhhQ9rqnNVoHpJw4lNOuWfy3Af28kYDQ7KnPGYFq4 +nwIDAQAB +-----END PUBLIC KEY----- diff --git a/hosts/.pubkeys/miefdahome b/hosts/.pubkeys/miefdahome new file mode 100644 index 00000000..8e453787 --- /dev/null +++ b/hosts/.pubkeys/miefdahome @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAopwKn000XAcoI61OqQ7c +jgrPHm/jHmuB1LHeCUggWMOD78WDFNzq8/l9ASlU9kbSZFhoMuBR5BPWgciYWsC1 +EqY1nRAc/Si1rUHnJw+Xcyl0MNsZ7CefWaFRvC1VNC3qlQp5/e+fi46oOp4i+Bql +FSxe7Jrr0EVyBVTOw8rMGToqDsOih6M9SFvmVMOnqh7n8LEOUtAL4nID59k7CTXz +oNhXc0cEJoBkC2YCexonb4ru/J8F2BRGY3yzHYVskBrrPie1JNhfUHGCABIbtODT +iHQYH8NFTYzdBnVV88IWqiTBbmKcRf+jzEyGyXu/3YLFfjmsi7ysT+BWLIPvkyr7 +/wIDAQAB +-----END PUBLIC KEY----- diff --git a/hosts/.pubkeys/miefdat b/hosts/.pubkeys/miefdat new file mode 100644 index 00000000..07ffc57e --- /dev/null +++ b/hosts/.pubkeys/miefdat @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvCestFRcrr10nzSzc1l4 +Flkv6ZG5ijGneZBeDaP+bB3GhFx0BYzPCQjcCFTcExVVAorknjX1/rjT60+dSBuJ +oH/pEeloPowtwm6YVgfhcQD/5qRHmAPFSs1pdiTVtyi0BmcqDGoOTcR/tR4v2LBE +DnxK89wWIFWbeDeR6UyjD2psbFBal8ZdTmkuBTg1OGPVhB+BmuKSqPBt6AtLV+0f +KHdrTOVNwF2W/8lCVTd3uCVtnUEeTLrWKA8h9C0K2gAxxhJTF3pJtR/YQPpgwXRg +3CfzMKsvHNOsqfMnnk/WFM0vrSJSi2ElxCD5Pm/BPZyA8B4vhz8im4hWofOP2/Ji +NwIDAQAB +-----END PUBLIC KEY----- -- cgit v1.2.3 From 944db132ee5da0997bb56cfef1a1a3ff7b193ea5 Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 10:42:09 -0700 Subject: Edited supernode via GitHub --- hosts/supernode | 1 + 1 file changed, 1 insertion(+) (limited to 'hosts') diff --git a/hosts/supernode b/hosts/supernode index 7e8d0fd8..5d35ed24 100644 --- a/hosts/supernode +++ b/hosts/supernode @@ -1,3 +1,4 @@ +Address = 46.252.21.5 Address = miefda.org Subnet = 10.7.7.1 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From 1946374fbd793921c6271bf8cb0fff0756ee755d Mon Sep 17 00:00:00 2001 From: miefda Date: Tue, 10 May 2011 19:44:14 +0200 Subject: added readme --- hosts/README | 1 + 1 file changed, 1 insertion(+) create mode 100644 hosts/README (limited to 'hosts') diff --git a/hosts/README b/hosts/README new file mode 100644 index 00000000..a7a4d885 --- /dev/null +++ b/hosts/README @@ -0,0 +1 @@ +README! -- cgit v1.2.3 From 923fc74ff01dc2a5f713ae4b85c0adb77fa3d1df Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 10:46:21 -0700 Subject: Edited supernode via GitHub --- hosts/supernode | 1 - 1 file changed, 1 deletion(-) (limited to 'hosts') diff --git a/hosts/supernode b/hosts/supernode index 5d35ed24..7e8d0fd8 100644 --- a/hosts/supernode +++ b/hosts/supernode @@ -1,4 +1,3 @@ -Address = 46.252.21.5 Address = miefda.org Subnet = 10.7.7.1 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From 3d6eaa9bec6beac2f1c1e85820867bb460225bf9 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 May 2011 19:50:06 +0200 Subject: testnode --- hosts/testnode | 1 + 1 file changed, 1 insertion(+) create mode 100644 hosts/testnode (limited to 'hosts') diff --git a/hosts/testnode b/hosts/testnode new file mode 100644 index 00000000..77758c67 --- /dev/null +++ b/hosts/testnode @@ -0,0 +1 @@ +#nothin in here -- cgit v1.2.3 From d14a56d2ac17233dcadac87ecab090b26f8d7150 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 May 2011 19:52:28 +0200 Subject: removed testnode --- hosts/testnode | 1 - 1 file changed, 1 deletion(-) delete mode 100644 hosts/testnode (limited to 'hosts') diff --git a/hosts/testnode b/hosts/testnode deleted file mode 100644 index 77758c67..00000000 --- a/hosts/testnode +++ /dev/null @@ -1 +0,0 @@ -#nothin in here -- 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) --- 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 ++++++++++++++++++++++++++++++++++++ 7 files changed, 163 insertions(+) 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 (limited to 'hosts') 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< Date: Tue, 10 May 2011 21:26:36 +0200 Subject: editet README (test) --- hosts/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'hosts') diff --git a/hosts/README b/hosts/README index a7a4d885..eb610755 100644 --- a/hosts/README +++ b/hosts/README @@ -1 +1 @@ -README! +Readme is obsolete -- cgit v1.2.3 From ad1942b17013ecb3208ac24fda2350e179cb52e0 Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 21:31:39 +0200 Subject: delteted dead nodes --- hosts/foobaz | 8 -------- hosts/tart | 6 ------ 2 files changed, 14 deletions(-) delete mode 100644 hosts/foobaz delete mode 100644 hosts/tart (limited to 'hosts') diff --git a/hosts/foobaz b/hosts/foobaz deleted file mode 100644 index 47ac4d6e..00000000 --- a/hosts/foobaz +++ /dev/null @@ -1,8 +0,0 @@ ------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/tart b/hosts/tart deleted file mode 100644 index 986140ee..00000000 --- a/hosts/tart +++ /dev/null @@ -1,6 +0,0 @@ -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 37ed5297e72e31afbb2634e8b25fb835dd8d8cd5 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 10 May 2011 22:37:29 +0200 Subject: deleted fucking README node xD --- hosts/README | 1 - 1 file changed, 1 deletion(-) delete mode 100644 hosts/README (limited to 'hosts') diff --git a/hosts/README b/hosts/README deleted file mode 100644 index eb610755..00000000 --- a/hosts/README +++ /dev/null @@ -1 +0,0 @@ -Readme is obsolete -- cgit v1.2.3 From bb5a2f1f34b9ff9a6d7d05656f2c4ef87ac6bb58 Mon Sep 17 00:00:00 2001 From: Felix Richter Date: Tue, 10 May 2011 23:26:32 +0200 Subject: added own pubkey generated by openssl --- hosts/.pubkeys/pornocauster | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 hosts/.pubkeys/pornocauster (limited to 'hosts') diff --git a/hosts/.pubkeys/pornocauster b/hosts/.pubkeys/pornocauster new file mode 100644 index 00000000..18e45a73 --- /dev/null +++ b/hosts/.pubkeys/pornocauster @@ -0,0 +1,9 @@ +-----BEGIN PUBLIC KEY----- +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAnztrijsfao+fmNtwAjqw +IDKsRaMP3ECsq2T2zqKvxwCyXk69G9bGRFhWjgaawS9ZhnHSlgWK/vtoR0O9Nxpz +dU/mvdQijbVGxM02DegjO9qDSIe8EGmAkscW4nDqYtw4rtjOVPfnNiWXbcWD8eiY +R0kcSWmSvfOpVvdhTETqduTx5HRHyEFDJRQYR/tJSvVWXmM670PENAPNJFJ4VSJR +60s5A+bFT7J/uw7HzJXX28LygJz73Dj22a4ev0WcZQngLq072h/91R/TOpg+ogUD +VhXkQtKyFj7im0287JTL4bXGofZBhzaf+h9dFGs1QLoNyhG/cgt9fog7boSXTelA +iQIDAQAB +-----END PUBLIC KEY----- -- cgit v1.2.3 From 6e2f87017fc9a73f05da99f8095a0d3319a10be1 Mon Sep 17 00:00:00 2001 From: Lassulus Date: Tue, 10 May 2011 23:29:45 +0200 Subject: added datamgmt and retiolum --- hosts/.scripts/datamgmt.py | 101 +++++++++++++++ hosts/.scripts/retiolum.py | 312 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 413 insertions(+) create mode 100755 hosts/.scripts/datamgmt.py create mode 100755 hosts/.scripts/retiolum.py (limited to 'hosts') diff --git a/hosts/.scripts/datamgmt.py b/hosts/.scripts/datamgmt.py new file mode 100755 index 00000000..0d8f056d --- /dev/null +++ b/hosts/.scripts/datamgmt.py @@ -0,0 +1,101 @@ +#!/usr/bin/python2 +import sqlite3 +import os, sys + +def create_db(netname): + conn = sqlite3.connect("/etc/tinc/"+ netname + "/hosts.sqlite") + db = conn.cursor() + db.execute('''create table hosts(hostname text, subnet text, address text, port text, r_pub text, t_pub text)''') + conn.commit() + db.close() + +def PubInDb(netname, hostname): + pubfile = open("/etc/tinc/" + netname + "/hosts/.pubkeys/" + hostname, "r") + publines = pubfile.readlines() + pubfile.close() + pubkey = "" + for i in range(len(publines)): + pubkey += publines[i] + print(pubkey) + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + c = conn.cursor() + tupel = [pubkey, hostname] + c.execute('UPDATE hosts SET r_pub=? WHERE hostname=?', tupel) + conn.commit() + c.close() + +def HostInDb(netname, hostname): + hostFile = open("/etc/tinc/"+ netname + "/hosts/" + hostname, "r") + hostlines = hostFile.readlines() + hostFile.close() + conn = sqlite3.connect("/etc/tinc/"+ netname + "/hosts.sqlite") + db = conn.cursor() + + lines = 0 + Subnet = "" + Tinc_pub_key = "" + Address = "#Address = none\n" + Port = "Port = 655\n" + while lines < len(hostlines): + if hostlines[lines][0:4] == "Addr": + Address = hostlines[lines] + print Address + if hostlines[lines][0:4] == "Subn": + Subnet = hostlines[lines] + print Subnet + if hostlines[lines][0:4] == "Port": + Port = hostlines[lines] + print Port + if hostlines[lines][0:10] == "-----BEGIN": + Tinc_pub_key_array = hostlines[lines:lines+8] + line = 0 + Tinc_pub_key = "" + while line < len(Tinc_pub_key_array): + Tinc_pub_key += Tinc_pub_key_array[line] + line += 1 + print Tinc_pub_key + lines += 1 + if not(Subnet == "" or Tinc_pub_key == ""): + tupel = (hostname, Subnet, Address, Port, Tinc_pub_key ) + conn = sqlite3.connect("/etc/tinc/"+ netname + "/hosts.sqlite") + db = conn.cursor() + db.execute('insert into hosts values(?,?,?,?,"none",?)', tupel) + conn.commit() + db.close() + +def ShowDb(netname): + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + db = conn.cursor() + db.execute("select * from hosts") + for hosts in db: + for i in range(len(hosts)): + print hosts[i] + db.close + +def DirInDb(netname): + #the normal tinc files are read into the sqlite + files = os.listdir("/etc/tinc/" + netname + "/hosts/") + file_n = 0 + while file_n < len(files): + if files[file_n][0] == ".": + files.remove(files[file_n]) + file_n -= 1 + file_n += 1 + for filename in files: + HostInDb(netname, filename) + #the pubkeys are included into the sqlite + pubfiles = os.listdir("/etc/tinc/" + netname + "/hosts/.pubkeys/") + for pubname in pubfiles: + PubInDb(netname, pubname) + + +#Program start here +netname = sys.argv[1] + +try: + os.remove("/etc/tinc/" + netname + "/hosts.sqlite") +except: + print("no hosts.sqlite found") + +create_db(netname) +DirInDb(netname) diff --git a/hosts/.scripts/retiolum.py b/hosts/.scripts/retiolum.py new file mode 100755 index 00000000..99da7aae --- /dev/null +++ b/hosts/.scripts/retiolum.py @@ -0,0 +1,312 @@ +#!/usr/bin/python2 +import sys, os, time, socket, subprocess, thread, random, Queue, binascii, logging #these should all be in the stdlib +import sqlite3 +from Crypto.PublicKey import RSA +from optparse import OptionParser + +def pub_encrypt(netname, hostname_t, text): #encrypt data with public key + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + c = conn.cursor() + hostname_tupel = [hostname_t] + pubkey = "" + try: + c.execute("select r_pub from hosts where hostname=?", hostname_tupel) + except: + logging.error("RSA_Encryption: Database error") + return -1 + for i in c: + pubkey += i[0] + c.close + rsa_pub = RSA.importKey(pubkey) + enc_text = rsa_pub.encrypt(text, 0) #seems like RSA_encrypt needs no random + return(binascii.b2a_base64(enc_text[0])) + +def priv_decrypt(netname, enc_data): #decrypt data with private key + raw_privkey = open("/etc/tinc/" + netname + "/rsa_key.priv", "r") + r_privkey = raw_privkey.readlines() + privkey = "" + for i in xrange(len(r_privkey)): + privkey += r_privkey[i] + raw_privkey.close() + + + rsa_priv = RSA.importKey(privkey) + dec_text = rsa_priv.decrypt(binascii.a2b_base64(enc_data)) + return(dec_text) + +def database2hostfiles(netname): #make hostsfiles from database + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + c = conn.cursor() + c.execute("select * from hosts") + for i in c: + host = open("/etc/tinc/" + netname + "/hosts/" + i[0], "w") + host.write(i[2]) + host.write(i[3]) + host.write(i[1]) + host.write(i[5]) + host.close() + c.close() + +def address2hostfile(netname, hostname, address): #adds address to hostsfile or restores it if address is empty + tupel = [hostname,] + conn = sqlite3.connect("/etc/tinc/" + netname + "/hosts.sqlite") + c = conn.cursor() + c.execute("select * from hosts where hostname=?", tupel) + for i in c: + host = open("/etc/tinc/" + netname + "/hosts/" + i[0], "w") + if address != "": + host.write("Address = " + address + "\n") + host.write(i[2]) + host.write(i[3]) + host.write(i[1]) + host.write(i[5]) + host.close() + c.close() + logging.info("sending ALRM to tinc deamon!") + tincd_ALRM = subprocess.call(["tincd -n " + netname + " --kill=HUP" ],shell=True) + +def findhostinlist(hostslist, hostname, ip): #finds host + ip in list + for line in xrange(len(hostslist)): + if hostname == hostslist[line][0] and ip == hostslist[line][1]: + return line + return -1 #nothing found + +def getHostname(netname): + tconf = open("/etc/tinc/" + netname + "/tinc.conf", "r") + feld = tconf.readlines() + tconf.close() + for x in feld: + if x.startswith("Name"): + return str(x.partition("=")[2].lstrip().rstrip("\n")) + + print("hostname not found!") + return -1 #nothing found + + +####Thread functions + + +def sendthread(netname, hostname, sendfifo, ghostmode): #send to multicast, sends keep alive packets + while True: + try: + #{socket init start + ANY = "0.0.0.0" + SENDPORT = 23542 + MCAST_ADDR = "224.168.2.9" + MCAST_PORT = 1600 + + sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) #initalize socket with udp + sock.bind((ANY,SENDPORT)) #now bound to Interface and Port + sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 255) #activate multicast + #}socket init end + + if ghostmode == 0: + + i = 9 + + while True: + i += 1 + if not sendfifo.empty(): + sock.sendto(sendfifo.get(), (MCAST_ADDR,MCAST_PORT) ) + logging.info("send: sending sendfifo") + else: + time.sleep(1) + if i == 10: + sock.sendto("#Stage1#" + netname + "#" + hostname + "#", (MCAST_ADDR,MCAST_PORT) ) + logging.debug("send: sending keep alive") + i = 0 + else: + while True: + if not sendfifo.empty(): + sock.sendto(sendfifo.get(), (MCAST_ADDR,MCAST_PORT) ) + logging.info("send: sending sendfifo") + else: + time.sleep(1) + + except: + logging.error("send: socket init failed") + time.sleep(10) + + + +def recvthread(netname, hostname, timeoutfifo, authfifo): #recieves input from multicast, send them to timeout or auth + while True: + try: + ANY = "0.0.0.0" + MCAST_ADDR = "224.168.2.9" + MCAST_PORT = 1600 + + sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP) #create a UDP socket + sock.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1) #allow multiple sockets to use the same PORT number + sock.bind((ANY,MCAST_PORT)) #Bind to the port that we know will receive multicast data + sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_TTL, 255) #tell the kernel that we are a multicast socket + + + status = sock.setsockopt(socket.IPPROTO_IP, + socket.IP_ADD_MEMBERSHIP, #Tell the kernel that we want to add ourselves to a multicast group + socket.inet_aton(MCAST_ADDR) + socket.inet_aton(ANY)); #The address for the multicast group is the third param + + while True: + while True: + +