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<