From 1cbb64fd336459a0f798d8685dd2ee232191ef3d Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 14 Jan 2014 03:36:05 +0100 Subject: tinc_setup: remove all the legacy code --- retiolum/scripts/tinc_setup/build_arch.sh | 14 ---- retiolum/scripts/tinc_setup/build_debian.sh | 32 --------- retiolum/scripts/tinc_setup/build_debian_clean.sh | 31 --------- retiolum/scripts/tinc_setup/build_ec2.sh | 16 ----- retiolum/scripts/tinc_setup/build_no.de.sh | 1 - retiolum/scripts/tinc_setup/install.sh | 84 ----------------------- 6 files changed, 178 deletions(-) delete mode 100755 retiolum/scripts/tinc_setup/build_arch.sh delete mode 100755 retiolum/scripts/tinc_setup/build_debian.sh delete mode 100755 retiolum/scripts/tinc_setup/build_debian_clean.sh delete mode 100755 retiolum/scripts/tinc_setup/build_ec2.sh delete mode 100644 retiolum/scripts/tinc_setup/build_no.de.sh delete mode 100755 retiolum/scripts/tinc_setup/install.sh (limited to 'retiolum') diff --git a/retiolum/scripts/tinc_setup/build_arch.sh b/retiolum/scripts/tinc_setup/build_arch.sh deleted file mode 100755 index 5ef5d765..00000000 --- a/retiolum/scripts/tinc_setup/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/retiolum/scripts/tinc_setup/build_debian.sh b/retiolum/scripts/tinc_setup/build_debian.sh deleted file mode 100755 index 52e61390..00000000 --- a/retiolum/scripts/tinc_setup/build_debian.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -set -x -if [ ! "$MYIP" ] -then - MYIP=10.0.7.7.55 -fi -if [ ! "$MYHOSTNAME" ] -then - MYHOSTNAME="penis" -fi - -if [ "$MYHOSTNAME" = "penis" ]; -then - read -n1 -p "name is penis, are u sure? [yN]" - if [[ "$REPLY" != [yY] ]] - then - echo "then better RTFC" - echo "bailing out" - exit 0 - fi -fi -apt-get install tinc git curl python - -./install.sh "$MYHOSTNAME" "$MYIP" - -# 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 - -/etc/init.d/tinc start diff --git a/retiolum/scripts/tinc_setup/build_debian_clean.sh b/retiolum/scripts/tinc_setup/build_debian_clean.sh deleted file mode 100755 index a7332f4e..00000000 --- a/retiolum/scripts/tinc_setup/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/retiolum/scripts/tinc_setup/build_ec2.sh b/retiolum/scripts/tinc_setup/build_ec2.sh deleted file mode 100755 index 79f2af28..00000000 --- a/retiolum/scripts/tinc_setup/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/retiolum/scripts/tinc_setup/build_no.de.sh b/retiolum/scripts/tinc_setup/build_no.de.sh deleted file mode 100644 index 2976d3a2..00000000 --- a/retiolum/scripts/tinc_setup/build_no.de.sh +++ /dev/null @@ -1 +0,0 @@ -pkgin in lzo gcc-tools gcc-compiler gcc34 diff --git a/retiolum/scripts/tinc_setup/install.sh b/retiolum/scripts/tinc_setup/install.sh deleted file mode 100755 index 9efe863c..00000000 --- a/retiolum/scripts/tinc_setup/install.sh +++ /dev/null @@ -1,84 +0,0 @@ -#! /bin/sh -# USE WITH GREAT CAUTION -set -eu - -if test "${nosudo-false}" != true -a `id -u` != 0; then - echo "we're going sudo..." >&2 - exec sudo "$0" "$@" - exit 23 # go to hell -fi - -#make -C ../../ update -set -e -DIRNAME=`dirname $0` -CURR=`readlink -f ${DIRNAME}` -MYBIN=${CURR}/../../bin -netname=retiolum -# create configuration directory for $netname -mkdir -p /etc/tinc/$netname/hosts -cd /etc/tinc/$netname - -echo "added known hosts:" -ls -1 hosts | LC_ALL=C sort -echo "delete the nodes you do not trust!" - -hostname="${HOSTNAME-`cat /etc/hostname`}" -myname="${1:-}" -if [ ! "$myname" ] -then - printf "select node name [$hostname]: " - read myname - if test -z "$myname"; then - myname="$hostname" - fi -fi -if [ ! -e "hosts/$myname" ] -then - - # TODO eloop until we found a free IPv4 - # myipv4=$(echo 42.$(for i in `seq 1 3`; do echo "ibase=16;`bin/fillxx xx|tr [a-f] [A-F]`" | bc; done)|tr \ .)/32 - - myipv4="${2:-}" - mynet4=10.243.0.0 - - if [ ! "$myipv4" ] - then - printf 'select v4 subnet ip (1-255): ' - read v4num - until $MYBIN/check-free-retiolum-v4 10.243.0.$v4num; do - echo "your're an idiot!" - printf 'select unused v4 subnet ip (1-255): ' - read v4num - done - myipv4="10.243.0.$v4num" - fi - echo "Subnet = $myipv4" > hosts/$myname - - myipv6=`$MYBIN/fillxx 42:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx`/128 - echo "Subnet = $myipv6" >> hosts/$myname -else - echo "own host file already exists! will not write again!" -fi - -cat>tinc.conf< Date: Tue, 14 Jan 2014 03:39:18 +0100 Subject: tinc_setup: update README according to what is currently working --- retiolum/scripts/tinc_setup/README | 18 ------------------ retiolum/scripts/tinc_setup/README.md | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 retiolum/scripts/tinc_setup/README create mode 100644 retiolum/scripts/tinc_setup/README.md (limited to 'retiolum') diff --git a/retiolum/scripts/tinc_setup/README b/retiolum/scripts/tinc_setup/README deleted file mode 100644 index 11d6f6e9..00000000 --- a/retiolum/scripts/tinc_setup/README +++ /dev/null @@ -1,18 +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_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 - also writes a python file inside the tinc/retiolum folder which posts - the public key into the IRC:freenode/#tincspasm -6. build_no.de - nonfunct no.de smartmachine build script diff --git a/retiolum/scripts/tinc_setup/README.md b/retiolum/scripts/tinc_setup/README.md new file mode 100644 index 00000000..11d6f6e9 --- /dev/null +++ b/retiolum/scripts/tinc_setup/README.md @@ -0,0 +1,18 @@ +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 + also writes a python file inside the tinc/retiolum folder which posts + the public key into the IRC:freenode/#tincspasm +6. build_no.de + nonfunct no.de smartmachine build script -- cgit v1.2.3 From 9e66fd62cf9038d38e1642790c74daa7fa292589 Mon Sep 17 00:00:00 2001 From: makefu Date: Wed, 22 Jan 2014 15:58:12 +0100 Subject: tinc_setup: remove legacy documentation --- retiolum/scripts/tinc_setup/README.md | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/tinc_setup/README.md b/retiolum/scripts/tinc_setup/README.md index 11d6f6e9..c4892474 100644 --- a/retiolum/scripts/tinc_setup/README.md +++ b/retiolum/scripts/tinc_setup/README.md @@ -1,18 +1,10 @@ -This directory contains the build and install scripts for shack-retiolum +# Description +new_install.sh is the script fur bootstrapping tinc. +We use irc for the initial key exchange, specifically +irc.freenode.com#krebs_incoming . -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 - also writes a python file inside the tinc/retiolum folder which posts - the public key into the IRC:freenode/#tincspasm -6. build_no.de - nonfunct no.de smartmachine build script +# Usage + + curl tinc.krebsco.de | HOSTN=bobkhan sh + # or + HOSTN=wrryyyyy ./new_install.sh -- cgit v1.2.3 From ce6ef0f78a5de16b72b513c960d011ebfca6dad4 Mon Sep 17 00:00:00 2001 From: lassulus Date: Thu, 23 Jan 2014 12:03:44 +0100 Subject: hosts: linuxatom (rtjure) --- retiolum/hosts/linuxatom | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/linuxatom (limited to 'retiolum') diff --git a/retiolum/hosts/linuxatom b/retiolum/hosts/linuxatom new file mode 100644 index 00000000..dfd09b51 --- /dev/null +++ b/retiolum/hosts/linuxatom @@ -0,0 +1,11 @@ +Subnet = 10.243.173.58 +Subnet = 42:1c07:1a24:1a26:c799:3b44:a8f5:59ea + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvGy172meTuwHfGZLVHi04+7jb+GRumqNRowffrmMOxFAq6wiL1E6 +7NfJFSc2/wmLZdTCnAtScVicVFZ8UEK2Uv/WMdevJWP63LxUOXpSFtoxNAlpSk9e +rzwxWj3VxHru7EZA6gu45ff4/seApy/jDy+hceOmOiG5z8VudoRYWe98IoO1ua0E +rtz415WP0xN+Mb4mGU48JSLYZkOHVIvkf+VVF5jXFbbnH+w0kkTuRMMp6Z7ETvdZ +RU9nKJ55sflkPhs1/ttU4cYkci55YPVGl7GCCr6Xw4oerIz/jHnzBGroh/wDpEXm +6RxpsC6DnVQUW3zw0DXuSKoAy0UoQPYqQwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 880f025d789b3752107efd4e26fc6305f0ed484e Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 29 Jan 2014 16:48:45 +0100 Subject: hosts: rtjure_ras (rtjure) --- retiolum/hosts/rtjure_ras | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/rtjure_ras (limited to 'retiolum') diff --git a/retiolum/hosts/rtjure_ras b/retiolum/hosts/rtjure_ras new file mode 100644 index 00000000..ba44cb02 --- /dev/null +++ b/retiolum/hosts/rtjure_ras @@ -0,0 +1,11 @@ +Subnet = 10.243.212.68 +Subnet = 42:627f:6f2a:b631:26f7:8d69:4c3a:23b0 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvu1ZjElrPpJ/ery0BAYxWPtb/ZLio+PuhrsOy9BBq6b7/FHw/1yf +GOCDa2fkdE1/pVLhI62KL+j/nDCgpHtVxzupVYKSyKOuZXnNGAS7vAHNM27jaYHp +3DTI0Npu13v2r5rgraPOm6eGrd/D0u2gr3T9Zq8PRtg5JrXBWMU4Ugt+Kfv0V+xL +v0lX21xZrUjvhtd0/vTcNkYLWZK5ftfU18/i3D6CimlG+AsKyeAnYe9Nkcmet84s +65SbgQ6SBr2YyN5c7wC9j1/Ney3k+aTbxsvHqDyQ8bq8WnsDQR2B8JPZGPLd7VHD +hdPGzus2PmJa84oB7smuUdt/5oAjzgghkQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 24157e8747fc1ddf4172cb94ac11d6dd93632349 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 4 Feb 2014 22:50:59 +0100 Subject: add pike --- retiolum/hosts/pike | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/pike (limited to 'retiolum') diff --git a/retiolum/hosts/pike b/retiolum/hosts/pike new file mode 100644 index 00000000..1d47a614 --- /dev/null +++ b/retiolum/hosts/pike @@ -0,0 +1,11 @@ +Subnet = 10.243.97.232 +Subnet = 42:4d6d:8699:99c2:0de9:ea78:8d50:f53a + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA0CS28CMhqeUuJxY+JEISeEDzP2I5T5ILFn4/3loEagEtS90QAm/K +rbMDbvJENrNCnaaOcHuOsG3vS8s31ffY9RM89Na2zjcV9l0QBhBkNebUr/Ol0nQp +ONWXEgmXV2mCGfFnC4uOHhELkZhnkwJduWfR5kyGPPApjxlBVIbI8pkAV4GFqjoF +WTTm9qp80G26sD4O2q+Ldv9eIKquPAHN/zMFk0TzhgmAylgQUcc84HdUDZ+g9n1Q +Ap62VwM8lGcnRy+f03cBaPyWQEEdnA3hG2mMfaaAoVYw4eruBbAz8GGUPMT3UH/E +rGGNmyVzzUQOKvnOjB4qvyseSI+/mPzGJQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 131fdec0538abda5d068c57cb2daf30fd82871aa Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 10 Feb 2014 18:26:34 +0100 Subject: hosts: new supernode fastpoke --- retiolum/hosts/fastpoke | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 retiolum/hosts/fastpoke (limited to 'retiolum') diff --git a/retiolum/hosts/fastpoke b/retiolum/hosts/fastpoke new file mode 100644 index 00000000..e3c0bf52 --- /dev/null +++ b/retiolum/hosts/fastpoke @@ -0,0 +1,12 @@ +Address = aidsballs.de +Subnet = 10.243.253.152 +Subnet = 42:422a:194f:ff3b:e196:2f82:5cf5:bc00 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAs4p5xsQYx06v+OkUbc09K6voFAbkvO66QdFoM71E10XyCeLP6iuq +DaIOFN4GrPR36pgyjqtJ+62G9uR+WsB/y14eio1p1ivDWgcpt5soOZAH5zVRRD9O +FBDlgVNwIJ6stMHy6OenEKWsfEiZRN3XstnqAqyykzjddglth1tJntn6kbZehzNQ +ezfIyN4XgaX2fhSu+UnAyLcV8wWnF9cMABjz7eKcSmRJgtG4ZiuDkbgiiEew7+pB +EPqOVQ80lJvzQKgO4PmVoAjD9A+AHnmLJNPDQQi8nIVilGCT60IX+XT1rt85Zpdy +rEaeriw/qsVJnberAhDAdQYYuM1ai2H5swIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From d03fc4c7fdc316504f71689269b2886fc4394644 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 11 Feb 2014 23:41:54 +0100 Subject: hosts: reimae added --- retiolum/hosts/reimae | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/reimae (limited to 'retiolum') diff --git a/retiolum/hosts/reimae b/retiolum/hosts/reimae new file mode 100644 index 00000000..bcdd0f1e --- /dev/null +++ b/retiolum/hosts/reimae @@ -0,0 +1,11 @@ +Subnet = 10.243.177.212 +Subnet = 42:5965:bb44:aed3:9d3d:29f6:201d:7adf + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA37lXlJpfT4pgxV1XB3VzUiALVjOexrHezJZ3YxgZTVUtTTxOnydl +urN7S4WaRgFkRPlwATGrp+KzJ6fz5/zeryYwbBUY66kcTEfJBP3+zKgWu3NIqOll +SCcnpjlEm46FcstJ5dnnuYqhpnp98z8QkTiXHZKMI4rB+yf5NdKnMetAUsSUe2wI +bXSxJ9lNrSm/IFToaVZ3KPYZwQ0HgzUxSWb5grkCuK5iWtGhqdf0/pqEzMpI1Y1c +QKepcJkRCUcd2InKb9AdpwT/xygNwbPkvjxIAKj7vK/4rr5LApJAOcFL+HJRz4CT +lDrM5LDeGtsIr+mIUbSTR6R0onWCn543LQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 8923831a4e794e5ccd6c485da71d8a18add789e0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 11 Feb 2014 23:46:13 +0100 Subject: hosts: reimae now supernode --- retiolum/hosts/reimae | 1 + 1 file changed, 1 insertion(+) (limited to 'retiolum') diff --git a/retiolum/hosts/reimae b/retiolum/hosts/reimae index bcdd0f1e..696c3442 100644 --- a/retiolum/hosts/reimae +++ b/retiolum/hosts/reimae @@ -1,3 +1,4 @@ +Address = reimae.de Subnet = 10.243.177.212 Subnet = 42:5965:bb44:aed3:9d3d:29f6:201d:7adf -- cgit v1.2.3 From cd0483f44a720e7f33cd75a7c9eeb454f5f2328d Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 13 Feb 2014 20:29:08 +0100 Subject: add ufo --- retiolum/hosts/ufo | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/ufo (limited to 'retiolum') diff --git a/retiolum/hosts/ufo b/retiolum/hosts/ufo new file mode 100644 index 00000000..8ccdb2c7 --- /dev/null +++ b/retiolum/hosts/ufo @@ -0,0 +1,11 @@ +Subnet = 10.243.191.183 +Subnet = 42:1349:b0ea:b4ca:a9ef:1086:5718:3ca2 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAmrDbqG+TzMsKLlaf7VzFmzPvR1d19r7O12ldEdgT29bJJ+bqYqaq +3KMITOgK6gZVP416gR74/JqD+CRE1ZU6DjVoAoMIB4mzPVgy65SJwHabXOTMYknb +qzAIhg6cN+6cfNrUTWynBT0kDX5241f2YHmJiRCV1WjzTS9DadGbLp7f6C7YruVo +cKbC60uaESCm+gfL/fql/NlLKGxP4tAqwHqta8CkYWfUjXEAhzonxJ7zI8FZOvxj +tLUBhKj4roWPN5CvzPwW+5ZRheAZezj+tmU3nCmlSufXLoFwu+2rqv60esTpZT4k +DjCRbHhvHVb3/xwQHxLWp4emINcGV2k9SQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 5d956536e08757641d75ca63c80f1b8d2d66b50d Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 16 Feb 2014 22:30:15 +0100 Subject: retiolum/hosts: add irvis --- retiolum/hosts/irvis | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/irvis (limited to 'retiolum') diff --git a/retiolum/hosts/irvis b/retiolum/hosts/irvis new file mode 100644 index 00000000..923a0dd7 --- /dev/null +++ b/retiolum/hosts/irvis @@ -0,0 +1,11 @@ +Subnet = 10.243.159.20 +Subnet = 42:db9b:ea89:dca4:fc6e:309b:23f0:ec09 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAr9EwWsVkeNqkFIvMYt/QalEGhKYTpM1MxR4DCG7hhZJcXOpigSC0 +fsB61FM/LkvG32/OTt7vPXSRfPW8RnRL0lxedNbMnax3pjgzP4yl4BAvEQW7AW/A +silSYFAr+4Br9ng99kQniXg+RJ9QHLq4Rg0V1/aOZWNWmSk4PmAzQfzINpTXZC3G +dUidZRIWJPTE1lJQfEpML1OI0UfiaYIAOE7Jhx+3vpzsePLF9s6iiw66ANg8mfFC +fb8OHP4zPrnoR/NSNLGjrhyXxiq2EMUmcG38xn769cMEvElzPd0pHYuEzTeYxlk5 +0YEqAsjMYIdaxVDMczRmP+BFH/+sdUcjAwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From fac7133f6dcc2aeb7083ad2971c1e7836b4a2453 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 18 Feb 2014 23:01:21 +0100 Subject: fix py2 py3 issue in supernodes script --- retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py b/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py index 7bb79708..7e1f4dae 100755 --- a/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py +++ b/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 def find_potential_super(path="/etc/tinc/retiolum/hosts"): import os @@ -56,4 +56,4 @@ if __name__ == "__main__": usage """ for host,addrs in check_all_the_super(): - print(host,addrs) + print("%s %s" %(host,str(addrs))) -- cgit v1.2.3 From bcc7aefa1c6fb999992c07327e1df9456814a283 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 13:41:11 +0100 Subject: retiolum github hosts sync: initial commit --- retiolum/scripts/github_hosts_sync/index | 62 ++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100755 retiolum/scripts/github_hosts_sync/index (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/index b/retiolum/scripts/github_hosts_sync/index new file mode 100755 index 00000000..31cbc763 --- /dev/null +++ b/retiolum/scripts/github_hosts_sync/index @@ -0,0 +1,62 @@ +#! /bin/sh +# TODO do_work should retry until success +set -euf + +port=1028 +local_painload=/krebs; remote_painload="git@github.com:krebscode/painload.git" +local_hosts=/tmp/hosts; remote_hosts="git@github.com:krebscode/hosts.git" + +main() { + ensure_local_painload + ensure_local_hosts + is_worker && do_work || become_server +} + +ensure_local_painload() { + test -d "$local_painload" || git clone "$remote_painload" "$local_painload" +} + +ensure_local_hosts() { + test -d "$local_hosts" || git clone "$remote_hosts" "$local_hosts" +} + +become_server() { + exec socat "TCP-LISTEN:$port,reuseaddr,fork" "EXEC:$0" +} + +is_worker() { + test "${SOCAT_SOCKPORT-}" = "$port" +} + +do_work() { + # read request + req_line="$(read line && echo "$line")" + req_hdrs="$(sed -n '/^\r$/q;p')" + + set -x + + cd "$local_hosts" + git pull >&2 + + cd "$local_hosts" + find . -name .git -prune -o -type f -exec git rm \{\} \; >/dev/null + + cd "$local_painload" + git pull >&2 + + find "$local_painload/retiolum/hosts" -type f -exec cp \{\} "$local_hosts" \; + + cd "$local_hosts" + find . -name .git -prune -o -type f -exec git add \{\} \; >&2 + if git status --porcelain | grep -q .; then + git commit -m bump >&2 + git push >&2 + fi + + echo "HTTP/1.1 200 OK" + echo + echo "https://github.com/krebscode/hosts/archive/master.tar.gz" + echo "https://github.com/krebscode/hosts/archive/master.zip" +} + +main "$@" -- cgit v1.2.3 From 2ce39803bf71bd49503ee8a6d81d73091883b465 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 13:48:03 +0100 Subject: hosts sync: add systemd files --- retiolum/scripts/github_hosts_sync/index | 2 +- .../scripts/github_hosts_sync/systemd/hosts-sync.conf | 1 + .../scripts/github_hosts_sync/systemd/hosts-sync.service | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 retiolum/scripts/github_hosts_sync/systemd/hosts-sync.conf create mode 100644 retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/index b/retiolum/scripts/github_hosts_sync/index index 31cbc763..7b444ea4 100755 --- a/retiolum/scripts/github_hosts_sync/index +++ b/retiolum/scripts/github_hosts_sync/index @@ -2,7 +2,7 @@ # TODO do_work should retry until success set -euf -port=1028 +port=${port-1028} local_painload=/krebs; remote_painload="git@github.com:krebscode/painload.git" local_hosts=/tmp/hosts; remote_hosts="git@github.com:krebscode/hosts.git" diff --git a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.conf b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.conf new file mode 100644 index 00000000..606f17b4 --- /dev/null +++ b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.conf @@ -0,0 +1 @@ +port=1028 diff --git a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service new file mode 100644 index 00000000..60d4799f --- /dev/null +++ b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service @@ -0,0 +1,15 @@ +[Unit] +Description=retiolum github hosts sync +After=network.target + +[Service] +EnvironmentFile=/etc/conf.d/retiolum-github-hosts-sync.conf +ExecStart=/krebs/retiolum/scripts/github_hosts_sync/index +KillMode=process +User=hosts-sync +Group=hosts-sync +Restart=yes + +[Install] +WantedBy=multi-user.target + -- cgit v1.2.3 From 69afd37b41d04b25a868da7d8fd2241b2a3aaa03 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 13:58:09 +0100 Subject: hosts sync: fix pasto --- retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service index 60d4799f..16235a6d 100644 --- a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service +++ b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service @@ -3,7 +3,7 @@ Description=retiolum github hosts sync After=network.target [Service] -EnvironmentFile=/etc/conf.d/retiolum-github-hosts-sync.conf +EnvironmentFile=/etc/conf.d/hosts-sync.conf ExecStart=/krebs/retiolum/scripts/github_hosts_sync/index KillMode=process User=hosts-sync -- cgit v1.2.3 From fabc9fa4705f4d1ae08468957a5bf4a0ecae672a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 14:02:51 +0100 Subject: hosts sync: fix remote painload uri --- retiolum/scripts/github_hosts_sync/index | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/index b/retiolum/scripts/github_hosts_sync/index index 7b444ea4..e4da9305 100755 --- a/retiolum/scripts/github_hosts_sync/index +++ b/retiolum/scripts/github_hosts_sync/index @@ -3,7 +3,7 @@ set -euf port=${port-1028} -local_painload=/krebs; remote_painload="git@github.com:krebscode/painload.git" +local_painload=/krebs; remote_painload="https://github.com/krebscode/painload" local_hosts=/tmp/hosts; remote_hosts="git@github.com:krebscode/hosts.git" main() { -- cgit v1.2.3 From 023e449de9e0f5731d9a88f7a9eacc18e1f9af96 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 14:03:04 +0100 Subject: hosts sync: fix service parse error --- retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service | 1 - 1 file changed, 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service index 16235a6d..83609740 100644 --- a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service +++ b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service @@ -8,7 +8,6 @@ ExecStart=/krebs/retiolum/scripts/github_hosts_sync/index KillMode=process User=hosts-sync Group=hosts-sync -Restart=yes [Install] WantedBy=multi-user.target -- cgit v1.2.3 From 93c56cedd11be673176f1519fd17d05f67844e34 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 14:08:47 +0100 Subject: hosts sync: fix local repo uris --- retiolum/scripts/github_hosts_sync/index | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/index b/retiolum/scripts/github_hosts_sync/index index e4da9305..53c96efd 100755 --- a/retiolum/scripts/github_hosts_sync/index +++ b/retiolum/scripts/github_hosts_sync/index @@ -3,8 +3,10 @@ set -euf port=${port-1028} -local_painload=/krebs; remote_painload="https://github.com/krebscode/painload" -local_hosts=/tmp/hosts; remote_hosts="git@github.com:krebscode/hosts.git" +local_painload=$HOME/painload +remote_painload="https://github.com/krebscode/painload" +local_hosts=$HOME/hosts +remote_hosts="git@github.com:krebscode/hosts.git" main() { ensure_local_painload -- cgit v1.2.3 From a265ea9d0693a25fffa2ed0eaa9622b91758f51a Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 14:10:56 +0100 Subject: hosts sync: rename index for nicer journal --- retiolum/scripts/github_hosts_sync/hosts-sync | 64 ++++++++++++++++++++++ retiolum/scripts/github_hosts_sync/index | 64 ---------------------- .../github_hosts_sync/systemd/hosts-sync.service | 2 +- 3 files changed, 65 insertions(+), 65 deletions(-) create mode 100755 retiolum/scripts/github_hosts_sync/hosts-sync delete mode 100755 retiolum/scripts/github_hosts_sync/index (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/hosts-sync b/retiolum/scripts/github_hosts_sync/hosts-sync new file mode 100755 index 00000000..53c96efd --- /dev/null +++ b/retiolum/scripts/github_hosts_sync/hosts-sync @@ -0,0 +1,64 @@ +#! /bin/sh +# TODO do_work should retry until success +set -euf + +port=${port-1028} +local_painload=$HOME/painload +remote_painload="https://github.com/krebscode/painload" +local_hosts=$HOME/hosts +remote_hosts="git@github.com:krebscode/hosts.git" + +main() { + ensure_local_painload + ensure_local_hosts + is_worker && do_work || become_server +} + +ensure_local_painload() { + test -d "$local_painload" || git clone "$remote_painload" "$local_painload" +} + +ensure_local_hosts() { + test -d "$local_hosts" || git clone "$remote_hosts" "$local_hosts" +} + +become_server() { + exec socat "TCP-LISTEN:$port,reuseaddr,fork" "EXEC:$0" +} + +is_worker() { + test "${SOCAT_SOCKPORT-}" = "$port" +} + +do_work() { + # read request + req_line="$(read line && echo "$line")" + req_hdrs="$(sed -n '/^\r$/q;p')" + + set -x + + cd "$local_hosts" + git pull >&2 + + cd "$local_hosts" + find . -name .git -prune -o -type f -exec git rm \{\} \; >/dev/null + + cd "$local_painload" + git pull >&2 + + find "$local_painload/retiolum/hosts" -type f -exec cp \{\} "$local_hosts" \; + + cd "$local_hosts" + find . -name .git -prune -o -type f -exec git add \{\} \; >&2 + if git status --porcelain | grep -q .; then + git commit -m bump >&2 + git push >&2 + fi + + echo "HTTP/1.1 200 OK" + echo + echo "https://github.com/krebscode/hosts/archive/master.tar.gz" + echo "https://github.com/krebscode/hosts/archive/master.zip" +} + +main "$@" diff --git a/retiolum/scripts/github_hosts_sync/index b/retiolum/scripts/github_hosts_sync/index deleted file mode 100755 index 53c96efd..00000000 --- a/retiolum/scripts/github_hosts_sync/index +++ /dev/null @@ -1,64 +0,0 @@ -#! /bin/sh -# TODO do_work should retry until success -set -euf - -port=${port-1028} -local_painload=$HOME/painload -remote_painload="https://github.com/krebscode/painload" -local_hosts=$HOME/hosts -remote_hosts="git@github.com:krebscode/hosts.git" - -main() { - ensure_local_painload - ensure_local_hosts - is_worker && do_work || become_server -} - -ensure_local_painload() { - test -d "$local_painload" || git clone "$remote_painload" "$local_painload" -} - -ensure_local_hosts() { - test -d "$local_hosts" || git clone "$remote_hosts" "$local_hosts" -} - -become_server() { - exec socat "TCP-LISTEN:$port,reuseaddr,fork" "EXEC:$0" -} - -is_worker() { - test "${SOCAT_SOCKPORT-}" = "$port" -} - -do_work() { - # read request - req_line="$(read line && echo "$line")" - req_hdrs="$(sed -n '/^\r$/q;p')" - - set -x - - cd "$local_hosts" - git pull >&2 - - cd "$local_hosts" - find . -name .git -prune -o -type f -exec git rm \{\} \; >/dev/null - - cd "$local_painload" - git pull >&2 - - find "$local_painload/retiolum/hosts" -type f -exec cp \{\} "$local_hosts" \; - - cd "$local_hosts" - find . -name .git -prune -o -type f -exec git add \{\} \; >&2 - if git status --porcelain | grep -q .; then - git commit -m bump >&2 - git push >&2 - fi - - echo "HTTP/1.1 200 OK" - echo - echo "https://github.com/krebscode/hosts/archive/master.tar.gz" - echo "https://github.com/krebscode/hosts/archive/master.zip" -} - -main "$@" diff --git a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service index 83609740..5fb9ed41 100644 --- a/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service +++ b/retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service @@ -4,7 +4,7 @@ After=network.target [Service] EnvironmentFile=/etc/conf.d/hosts-sync.conf -ExecStart=/krebs/retiolum/scripts/github_hosts_sync/index +ExecStart=/krebs/retiolum/scripts/github_hosts_sync/hosts-sync KillMode=process User=hosts-sync Group=hosts-sync -- cgit v1.2.3 From 180f3dd6c9cf6ea3a0d150c8a85d300dd09b177b Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 14:13:49 +0100 Subject: retiolum/hosts: rip UTART --- retiolum/hosts/UTART | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 retiolum/hosts/UTART (limited to 'retiolum') diff --git a/retiolum/hosts/UTART b/retiolum/hosts/UTART deleted file mode 100644 index 3c8628cf..00000000 --- a/retiolum/hosts/UTART +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 42.227.239.205/32 ------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 1cd304b57bc2ad725fa074d4537c2bdefa821085 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 19 Feb 2014 14:23:13 +0100 Subject: hosts-sync: add #?-doc --- retiolum/scripts/github_hosts_sync/README | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 retiolum/scripts/github_hosts_sync/README (limited to 'retiolum') diff --git a/retiolum/scripts/github_hosts_sync/README b/retiolum/scripts/github_hosts_sync/README new file mode 100644 index 00000000..12aa8dfe --- /dev/null +++ b/retiolum/scripts/github_hosts_sync/README @@ -0,0 +1,26 @@ +#? /bin/sh + +useradd -m hosts-sync +cp systemd/hosts-sync.service /etc/systemd/system/ +cp systemd/hosts-sync.conf /etc/conf.d/ + +sudo -u hosts-sync -i ssh-keygen +add /home/hosts-sync/.ssh/id_rsa.pub as github/krebscode/hosts deploy key +sudo -u hosts-sync -i git clone git@github.com:krebscode/hosts.git ~hosts-sync/hosts # to accept the remote key (and have an initial copy) + +sudo -u hosts-sync -i git config --global user.email hosts-sync@ire.retiolum +sudo -u hosts-sync -i git config --global user.name hosts-sync +sudo -u hosts-sync -i git config --global push.default simple + +systemctl start hosts-sync +systemctl enable hosts-sync + +TODO firewall setup + +#? /bin/sh (update service) +git pull +cp retiolum/scripts/github_hosts_sync/systemd/hosts-sync.service /etc/systemd/system/ +systemctl daemon-reload +systemctl restart hosts-sync + + -- cgit v1.2.3 From 7c97efffbfe54dd4eee78e3ace2d4819a354ebe1 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 19 Feb 2014 17:43:33 +0100 Subject: hosts: new host sokrates --- retiolum/hosts/sokrates | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/sokrates (limited to 'retiolum') diff --git a/retiolum/hosts/sokrates b/retiolum/hosts/sokrates new file mode 100644 index 00000000..97cf1b47 --- /dev/null +++ b/retiolum/hosts/sokrates @@ -0,0 +1,11 @@ +Subnet = 10.243.97.126 +Subnet = 42:28be:6907:ab4b:5c79:99f5:a4a1:2a25 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA0emA0JAong4wHSAEUrLrkh21n8I/+pLtpS4uGTcMHn9ZrS8Tg101 +S2poRE0jZUZu868mDeOwwxZRLmCE+bL0q1OrAUDY7+ricQSAz3CNQAAQB0Sjp7ju +YXKqLZQEYyOV3M8IJOALS72q4g1VTv5jQrLhGzMsv9vzuRSZV0pEV8tZwb187wLi +n27rwB6SPZv7uhC3R060x8Ze/pLmfmVfrxb9DwZS3d8X1PwygTrTjSAUTeMaDa69 +NSOzvKLx25fhZ0Gm3BA3pUQDEOiGOze3oT/0l3QJMvZ48TbG1KlSBOVwtL3+f5yM +gJZLF/JoTsYL0aZM+zHL6NAUmciy9dNXEQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 3ed35ed3e1efa4f741c0913efc90c9c36eb32d01 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 19 Feb 2014 22:44:32 +0100 Subject: hosts cleanup, bye pico and slowpoke --- retiolum/hosts/pico | 11 ----------- retiolum/hosts/slowpoke | 14 -------------- 2 files changed, 25 deletions(-) delete mode 100644 retiolum/hosts/pico delete mode 100644 retiolum/hosts/slowpoke (limited to 'retiolum') diff --git a/retiolum/hosts/pico b/retiolum/hosts/pico deleted file mode 100644 index b08b450d..00000000 --- a/retiolum/hosts/pico +++ /dev/null @@ -1,11 +0,0 @@ -Address = 78.111.78.33 -Subnet = 10.243.0.102/32 -Subnet = 42:b103:275c:1723:edc8:b24d:452b:352a/128 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsbe4wzTOHHLyuPO/AsfDqQHyV41qgs3dqt6uWcDcdiEsUvbCK9Ch -MQNkTktlrMRyvz6Qm/3DKptp80R648j0nWi/c3aLDkZq8weEnR9SFYfNaUp/GN4s -+Qhb+836d8Hu2+3jZWlr5Zb/p8hyhcx3NUH/skuH6Hu+piWczlN1NGksf5f7N/bp -ZBCXnCLLUYVM/0RIS8mcAIX44Zx8YFDXpByePUdyrzn+mRln6VFDnt5uGsmNw6G/ -Azn3grpidcyrW2cs3b7rysKsxOvyGBdu2zGXp+pquZq1l3f06IN+fzCtnyLTPL1K -UUEJlQa1Gsl2pVi5+HPcAj3U2yp42WJYNwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/slowpoke b/retiolum/hosts/slowpoke deleted file mode 100644 index 27b1e57c..00000000 --- a/retiolum/hosts/slowpoke +++ /dev/null @@ -1,14 +0,0 @@ -Address = 62.113.241.235 -Subnet = 10.243.232.121 -Subnet = 42:7d8f:9e3a:dcc7:9b22:d1ca:7e28:fe9c -Subnet = 172.22.0.0/15 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA9EtaOHLa0CyOGpX3rzMLqi9HqrjzVe3XdSfcb9QPYwcbxpPYNLLk -/1+4vxOI/TEh1QCu0bzPLy8tAwKF2DwnCH72yae17I0jVMW29Ng3Fdjzb3SmWJbf -C87X7c+Nx5+Yc7OIdvTi/BGPNpDEp7nJugubH1whSFfulCDbsGU3rX5IsDUiw4ha -B+5wH1coQl+Yp+M1ws5+PoHgYQ/ApYPBKEn+H7JAdnOTLbo0eI3B1PuDUrsMakMq -s4f74d2Z405xUGHhRRcerF0h5VD58TADxx7RSRd7oR06KlXM/RaqOkw9vzvA2vBq -CC+LdtIV7wWxF3uRAnk6odeFvqZTHvR4WQIDAQAB ------END RSA PUBLIC KEY----- - -- cgit v1.2.3 From 2925d6cb15b5df594dde296624389ae201392101 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 22 Feb 2014 15:47:22 +0100 Subject: hosts: kiosk v6 Address --- retiolum/hosts/kiosk | 1 + 1 file changed, 1 insertion(+) (limited to 'retiolum') diff --git a/retiolum/hosts/kiosk b/retiolum/hosts/kiosk index b490e8cd..8f53a08f 100644 --- a/retiolum/hosts/kiosk +++ b/retiolum/hosts/kiosk @@ -1,3 +1,4 @@ +Address = 2003:6a:674e:1001:211:25ff:fe05:a54d/64 Subnet = 10.243.232.122 Subnet = 42:1ad1:b481:00f5:aab8:f8cc:51fe:4b87 -- cgit v1.2.3 From f91c15a6ac8e94dae54f4cdaa93defd3f7006226 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 15:51:25 +0100 Subject: update docker to remove itself after completion --- retiolum/t/docker/docker_boostrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/t/docker/docker_boostrap.sh b/retiolum/t/docker/docker_boostrap.sh index 82673dd4..6288b09a 100755 --- a/retiolum/t/docker/docker_boostrap.sh +++ b/retiolum/t/docker/docker_boostrap.sh @@ -1,5 +1,5 @@ #!/bin/sh cd $(dirname $(readlink -f $0)) -docker_id=$(docker run -d -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap ) +docker_id=$(docker run -d -rm=true -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap ) trap "docker rm $docker_id" INT TERM EXIT QUIT docker wait $docker_id -- cgit v1.2.3 From e0a6751890271e073f756cabdf1b9bcdb068712e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 16:04:34 +0100 Subject: unfix all the docker tests, sorry :( --- retiolum/t/docker/docker_boostrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/t/docker/docker_boostrap.sh b/retiolum/t/docker/docker_boostrap.sh index 6288b09a..82673dd4 100755 --- a/retiolum/t/docker/docker_boostrap.sh +++ b/retiolum/t/docker/docker_boostrap.sh @@ -1,5 +1,5 @@ #!/bin/sh cd $(dirname $(readlink -f $0)) -docker_id=$(docker run -d -rm=true -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap ) +docker_id=$(docker run -d -v $PWD/docker_tests/:/test ubuntu /bin/sh /test/bootstrap ) trap "docker rm $docker_id" INT TERM EXIT QUIT docker wait $docker_id -- cgit v1.2.3 From 7049ff613d9be726a00571c8a62c4e5a93bc78f5 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 11 Mar 2014 17:14:23 +0100 Subject: wall -> go --- retiolum/hosts/go | 13 +++++++++++++ retiolum/hosts/wall | 13 ------------- 2 files changed, 13 insertions(+), 13 deletions(-) create mode 100644 retiolum/hosts/go delete mode 100644 retiolum/hosts/wall (limited to 'retiolum') diff --git a/retiolum/hosts/go b/retiolum/hosts/go new file mode 100644 index 00000000..60dc6dc6 --- /dev/null +++ b/retiolum/hosts/go @@ -0,0 +1,13 @@ +Address = 176.9.48.250 +Subnet = 10.243.248.11 +Subnet = 42:e1b6:4748:b0cf:555c:bdfe:26de:3a9d +Subnet = 172.22.0.0/15 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEApKt/lYqRgl4KE1ouSi5nbt7n7FEjECkGtkRhLFDJs0uWNvPj7wEh +nTtqzk7lJ8upHgmNN+1w98n2bcJ7Qcbz8vCcMEO7MXdlzGH9vet/g6ZgQ/Z1ijHl +IxYeH7yyBDLoJ2gghMhiSF0cezFDmNKPMhN+cGr9Lou54igK3I5CMIMN8cx0Fu0G +uLAxvnZfxIzzCnrF9xvZ6i3g/rEcaGjxmAysCW8SQdRmBKlkzQaUbLy39V2Z5y6m +SWR7gIGgMVCkpSeWUVSi05wgnMhoEu6LEYTBy/3bPK96O/Y7JBVpYUHqk/ya2PNR +eaHfEpCrKsek4t/5hcLk64Eo/ydzeU+gAQIDAQAB +-----END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/wall b/retiolum/hosts/wall deleted file mode 100644 index 60dc6dc6..00000000 --- a/retiolum/hosts/wall +++ /dev/null @@ -1,13 +0,0 @@ -Address = 176.9.48.250 -Subnet = 10.243.248.11 -Subnet = 42:e1b6:4748:b0cf:555c:bdfe:26de:3a9d -Subnet = 172.22.0.0/15 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEApKt/lYqRgl4KE1ouSi5nbt7n7FEjECkGtkRhLFDJs0uWNvPj7wEh -nTtqzk7lJ8upHgmNN+1w98n2bcJ7Qcbz8vCcMEO7MXdlzGH9vet/g6ZgQ/Z1ijHl -IxYeH7yyBDLoJ2gghMhiSF0cezFDmNKPMhN+cGr9Lou54igK3I5CMIMN8cx0Fu0G -uLAxvnZfxIzzCnrF9xvZ6i3g/rEcaGjxmAysCW8SQdRmBKlkzQaUbLy39V2Z5y6m -SWR7gIGgMVCkpSeWUVSi05wgnMhoEu6LEYTBy/3bPK96O/Y7JBVpYUHqk/ya2PNR -eaHfEpCrKsek4t/5hcLk64Eo/ydzeU+gAQIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From f9da427400986577442617aeecd745c061dbb69c Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 11 Mar 2014 17:22:59 +0100 Subject: rm euer --- retiolum/hosts/euer | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 retiolum/hosts/euer (limited to 'retiolum') diff --git a/retiolum/hosts/euer b/retiolum/hosts/euer deleted file mode 100644 index d2240575..00000000 --- a/retiolum/hosts/euer +++ /dev/null @@ -1,12 +0,0 @@ -#Address = euer.krebsco.de -Address = 84.23.67.119 -Subnet = 42:974a:3ecf:3c49:06c0:4cd1:3c6f:59d9/128 -Subnet = 10.243.0.95/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEArx2mZOPEfS8fvmQYSzWuMmNtfposJlctDfGVmhMVotaFIpIBcKuL -dHZHI8BAStaM++DuqKv/QBjk9jF6BRAdZqHn98LHXR+VRJmFvgelEFe0uPvIRMe2 -IMzi9Ly0f0f5L90ulZBMkudl56nBcEPuG5ge9RLDINIX5nDVh0oQzvrwWaIiVuy/ -oKDFLaoxa3SSsCXbhnbP7ow37+xzvaVCFolu++yLHvinkCc5g3IUkBGwr3kXKHQ7 -J8oDuPgsDZ7d1kMPfzMtGI9xcq8GFeCmJsMAt86XsWD8t9ogQpVUi8NGjR4cbQSI -TbE2iVBsdGLpxbGh833uy7fW5CCnK79DwwIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From ddd941a70ea920f0d6841640243c5cd3dd734b25 Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Mar 2014 21:13:54 +0100 Subject: hosts: new miefda0 --- retiolum/hosts/miefda0 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/miefda0 (limited to 'retiolum') diff --git a/retiolum/hosts/miefda0 b/retiolum/hosts/miefda0 new file mode 100644 index 00000000..acf00124 --- /dev/null +++ b/retiolum/hosts/miefda0 @@ -0,0 +1,10 @@ +Subnet = 10.243.8.1 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqrYc7LfSPjKpgnbfENU3oeAoFIRnG1CKHi0r4Tvy34anMBRHA4yY +olPC/IWiNoEadnCvlAEGtcFFh/xncNm+rW+BhO1WPLuo0wDe5fxJrkApuuhwP/lk +DMNrKtPOH6PV18yuQTtWgmiLo9gT15rRTDs8SaEf9eyTEV6zWVRDFDiFqwuY77iJ +GihKSlKGDYCUdT8TdaguUQ8akdAUhfXk0F33fAqTYwT25BDAXJdeldTLTb/5EADx +UMhnY0CsWgDYz9fpL5UNUDe3Gu53GghFS5RWvApasbzmlbrCwCF7MFDfc/yJFCrE +lF3Nm+GVqU6Uu6cNJ9VYHCu+uxk4PIU5GQIDAQAB +-----END RSA PUBLIC KEY----- +ECDSAPublicKey = DEwsTd8tdaQLx/o0EgIOl9l+d0MqDRLEVWnBT9imfRyuzXWatwgXotADc723HxhZ4NXlvuOu+er7PdWstif3nS9/qC -- cgit v1.2.3 From e8a9bed5c5262ae83afda7201699ce832b7b344a Mon Sep 17 00:00:00 2001 From: lassulus Date: Wed, 12 Mar 2014 21:14:10 +0100 Subject: hosts: cleanup dead nodes --- retiolum/hosts/Discordius | 11 ----------- retiolum/hosts/kaah | 10 ---------- retiolum/hosts/miefda | 11 ----------- retiolum/hosts/pante_miner | 10 ---------- retiolum/hosts/supernode | 13 ------------- 5 files changed, 55 deletions(-) delete mode 100644 retiolum/hosts/Discordius delete mode 100644 retiolum/hosts/kaah delete mode 100644 retiolum/hosts/miefda delete mode 100644 retiolum/hosts/pante_miner delete mode 100644 retiolum/hosts/supernode (limited to 'retiolum') diff --git a/retiolum/hosts/Discordius b/retiolum/hosts/Discordius deleted file mode 100644 index 561b28ca..00000000 --- a/retiolum/hosts/Discordius +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 10.243.144.246 -Subnet = 42:017a:4584:17e1:685a:3991:6533:067b - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsOoWkyydyfW9ml7SBV8d+qXU8E1c4l0vEpdBnmOouZozo1bzzkH3 -bLn2DkZaOLCqVUC1twbeGi2a7tXHh4dLvkIcT38V3XbEwxHhMn7enpKr79GO/VFf -Lu8t5dLbmPFFTOEeC54ke8X4MdlMrUMuXiGspnl/vc1NBSJIVECl6zdqvZt/UTWA -vI7evk3F+Tf5dPATqSMdxE5506i2y/W6obwYwaXdPbyBsAQkgdTjfVUe2u0GKfld -/THprmZYTwlBEZ3YAf12OdfO1aRsDpbogpZs/rcnebScDj7myzh7FkLHdH9nIfxg -dfGxSBV7kRMwQmgfKjp/yETPjvRz0OMZoQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/kaah b/retiolum/hosts/kaah deleted file mode 100644 index d8971c56..00000000 --- a/retiolum/hosts/kaah +++ /dev/null @@ -1,10 +0,0 @@ -#Address = kaah.ath.cx -Subnet = 42.220.181.17/32 ------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/retiolum/hosts/miefda b/retiolum/hosts/miefda deleted file mode 100644 index 1de261d9..00000000 --- a/retiolum/hosts/miefda +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 10.243.0.30 -Subnet = 42:59fd:1f99:d9b4:9fda:dd80:ff61:6497/128 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAtWySxln5f1ibnguV9FPOGvw15Xn+9HG5qRDv8buu30YGdJ8yaq6L -LwjZjNJ+fbHx5lNkDcD+qZXGi/jBiIFPOnAlNZwcOSlBtlplLX6/2H2Ix3RTrhUm -Dh2s0VLGBPZ+tNO4TtR/RyYJVfVYN6BrKhAWGkffeo0bHFIpiAOQyr1bmbFUMs6q -0SzX987ey3STDVPdiTNHW7ogFS/18QwOcI4eYVoYK6jgPvutNYt5lpP5qRczgCpd -Ra+cZk9Lx1mbS1jEAhCYDmqmEqlA2p2ceTOHibjOMzOPkkzEcIwntP4iU+26E4aW -YS4snJDR9bMXk85rY5Huo9jq7z95T788WQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/pante_miner b/retiolum/hosts/pante_miner deleted file mode 100644 index c363681f..00000000 --- a/retiolum/hosts/pante_miner +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.243.26.211 -Subnet = 42:b6c2:e63c:d178:a71d:e36b:8ef6:abde ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA65AhOXR3oOUcJi6qxnCWC7BduLyBth8SWsXhzKvyTLEqXBH8KcuL -H9UOrSLnwcueE2wMeHh5Rz4S3J+dwUJkGvD6eMXyJDiuIoaB8B7Iqjo1beS3gf9D -4nOv6YBjE0LsUwGKnZIR2E852MBcKUdZx4WdAYL8lB9ucFVBjKln8GxTZ1q4GEFx -XiCJddvCY9HnjlUBhCRghmRUYlgbhkNJhp0zclS8qXhqCa4cjrc586NY6dZDiIhY -AivuJayZEnrM/iEFobLcQnmq8n5o9iHCKbqRhemLeO2BAwn7SwSXnF1iTqbzK5df -zaA/G/6esPKyLfjJ7rgNBtUSfEC0Ro8yFQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/supernode b/retiolum/hosts/supernode deleted file mode 100644 index 354beba0..00000000 --- a/retiolum/hosts/supernode +++ /dev/null @@ -1,13 +0,0 @@ -Address = 46.252.21.5 -Subnet = 42:0:0:0:0:0:0:255/128 -Subnet = 10.243.0.1/32 -Subnet = 0.0.0.0/0 -Compression = 9 ------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 3559f5c2f106fdaa9deeb98f8c83881a3d4d357e Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 13 Mar 2014 18:52:14 +0100 Subject: retiolum/hosts/ohz: final commit --- retiolum/hosts/ohz | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 retiolum/hosts/ohz (limited to 'retiolum') diff --git a/retiolum/hosts/ohz b/retiolum/hosts/ohz deleted file mode 100644 index e452743b..00000000 --- a/retiolum/hosts/ohz +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.243.118.171/32 -Subnet = 42:a06d:7412:809a:b74a:8052:daba:c99f/128 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA7vZFyHtBC9WbXTKcJ2mXxTsZnZqGrDzP7PVtkaBQfTT6J2Qtct5i -0klA8yvXHUeVdt+hho7rISX4LJr+RDVdhU4ZgrcyJ3rR3moRGzLUV2VLroc1Mnbs -kkK1mowNk/jZpf6XyRpGL+NFMCZexmfjTdMaMLhzoRbA6w/ffPSSuDZdbG2F5bMk -BmF6biPcS9Z652ePXh9ViUUKBpLTHQvgK5/iZjI6ik/eit50jrjO6MapUVP/7qob -VeXE7Zos3UuHLiKegN68VbFQp4qu7jNH4jRun3Pm/Zd/OaGCREIDnfyIyauDNkaT -QUEL+h0zsM+t2rLT08Wo/sdNX16iMrs9FwIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From f6cc8689486f786c94bee176fcdd2a4002578a1e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 22 Mar 2014 02:07:30 +0100 Subject: hosts: new host uriel --- retiolum/hosts/uriel | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/uriel (limited to 'retiolum') diff --git a/retiolum/hosts/uriel b/retiolum/hosts/uriel new file mode 100644 index 00000000..ae902798 --- /dev/null +++ b/retiolum/hosts/uriel @@ -0,0 +1,11 @@ +Subnet = 10.243.131.22 +Subnet = 42:e8d1:ba71:35e4:b69e:9596:9480:3ee4 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEApYsqsKU12SIkzq2xdCiKGyV+50rzWx3painGWW4+VZp7cWFhHub +ifl8WZ8wX9m8pG8Fg9Tti4cpIHPWh38vL+6TLJwrIgzBEW5ewSx7aXYVDM/tiXz +e3MVNik56MVfVV8JR9G3fX1YuBz4mvvM2EHAJqjU5lTHQdaUYpwltPOMr4r+WPh +ApypBUn44TBPZBBLozzM9UgQE18pSTR8aVrc0RPLVJ/xECbVUI/lAvPhx9a1V9P +iHO0ubltyliG6NOPckHknOA/SrXIq51exn9E8/Xs6BhgA5FafPK+lXxvGCA8V30 +RJcvPd14QrIKnaetDy9pAbHjFNjHM9Y9BQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From ea08893da532c7d176bac5390f91d9b3b5c6cc51 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 22 Mar 2014 03:25:24 +0100 Subject: hosts: fix uriel --- retiolum/hosts/uriel | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'retiolum') diff --git a/retiolum/hosts/uriel b/retiolum/hosts/uriel index ae902798..76e43047 100644 --- a/retiolum/hosts/uriel +++ b/retiolum/hosts/uriel @@ -1,11 +1,11 @@ -Subnet = 10.243.131.22 -Subnet = 42:e8d1:ba71:35e4:b69e:9596:9480:3ee4 +Subnet = 10.243.81.176 +Subnet = 42:dc25:60cf:94ef:759b:d2b6:98a9:2e56 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEApYsqsKU12SIkzq2xdCiKGyV+50rzWx3painGWW4+VZp7cWFhHub -ifl8WZ8wX9m8pG8Fg9Tti4cpIHPWh38vL+6TLJwrIgzBEW5ewSx7aXYVDM/tiXz -e3MVNik56MVfVV8JR9G3fX1YuBz4mvvM2EHAJqjU5lTHQdaUYpwltPOMr4r+WPh -ApypBUn44TBPZBBLozzM9UgQE18pSTR8aVrc0RPLVJ/xECbVUI/lAvPhx9a1V9P -iHO0ubltyliG6NOPckHknOA/SrXIq51exn9E8/Xs6BhgA5FafPK+lXxvGCA8V30 -RJcvPd14QrIKnaetDy9pAbHjFNjHM9Y9BQIDAQAB +MIIBCgKCAQEAnj73pgX0RqQ3T6AIgWYpGS8FYLTQfj4BPOprWXBCi4msHKPv1NDP +rjn7XqckThm/gKY+epfaCQWBMi3jh6Tq4MZe3EbTl9vXm2AZNQSIF9ycVoNDBaC0 +wpEbNAelDFeyAqXwR58v7FzayWkHKpEGNAivROEDohmJ3ZbR42K656A7j2hODC28 +uUuvHzUTat1B/tdX5TBV6qU96NueIKkACuV+QTP6vWl3M44SQhZkimzHEZniDwnH +F2Kj3EWml5BUySzS3sDuCrg9xTbYxhrkpOOpr8ekWBNSj74qmwEIKj66+ZQ4M8JK +U6D3iLCe2/W0NbbYU1Xdq5ANjBisOqUadwIDAQAB -----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 34140ad4ce88338986485ae9a6859d5dd9dd3357 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 22 Mar 2014 21:57:21 +0100 Subject: hosts: new hosts zombiecancer --- retiolum/hosts/zombiecancer | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/zombiecancer (limited to 'retiolum') diff --git a/retiolum/hosts/zombiecancer b/retiolum/hosts/zombiecancer new file mode 100644 index 00000000..c073123f --- /dev/null +++ b/retiolum/hosts/zombiecancer @@ -0,0 +1,11 @@ +Subnet = 10.243.226.40 +Subnet = 42:2cb2:77f2:86c1:ffcc:f9ff:fdcb:726f + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwmIAhFzsJb6Pjy8TjAWMECwh8TRYIFaL0sAzGMtoibyAUnIpX6UU +kYLYUjsd6Wo8HZUn38awjoa0tD1SE43UueyD45OAEk3zYY9/ku0BVBOgGYZahcWO +cKMkO1BtIle7lI4/+gxyfoSrj+2/0pf56odFIZTIV+kyKtFg+97Mn/eb6o7b46oR +edhU+Nz02YGLuSs4Pv663GAuIyCUj0OTxhX3F3lYWYyP6Hbj4FW5W8YJrlfw12x3 +f5OUceLLBz2JTk2thBSgd/bXW4hAOFgpuHTu8FWZ4sh7vKFiRmPyTTN0uE7NaVdX +vSw7x+V9kSeonkW7uPp6A3ngl1ki2xc8AwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From e0e2329d9a7fbe5d81338faad286bb65125b7a3f Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 24 Mar 2014 13:49:36 +0100 Subject: add rockit --- retiolum/hosts/rockit | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/rockit (limited to 'retiolum') diff --git a/retiolum/hosts/rockit b/retiolum/hosts/rockit new file mode 100644 index 00000000..fc31c191 --- /dev/null +++ b/retiolum/hosts/rockit @@ -0,0 +1,11 @@ +Subnet = 10.243.199.33 +Subnet = 42:cec2:0a67:0ebb:7d97:8138:ac9a:8a58 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAnUtx3KPzNmS6/LxpYSolmhmF+Xqsum2po3lvmZszu2aIKdcAeIfb +B6bwz08zC9UNQjnO+27px5LMTTH9zhzRxo5xP/mcco2mVQFl5V+/73qBW5NnUV+4 +nPvUDi0+IhuVixHc+KlkxiHhgIDLdCN2WvVTkUCgxT2xVlPoESXq1dhdE3/5vvJt +0tphFUnP0sLCVzV25IYCocul+ELj8PAc/9mP4twifM4V0uwhh+J3AHR0+14QM61r +9qRhEnNEEkGeToYQPsoromiKPWczerUPBpaQHOpjnjg08Coz4OyrrM7+DXyspPfT +/862pAygKmeJMuzT2b52JbRlk3NMCxw5wQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 6f1b4a19e7d97bd125abd1b9128d797bcf3264f0 Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 24 Mar 2014 13:54:58 +0100 Subject: fix whitespace in rockit --- retiolum/hosts/rockit | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'retiolum') diff --git a/retiolum/hosts/rockit b/retiolum/hosts/rockit index fc31c191..a81d3148 100644 --- a/retiolum/hosts/rockit +++ b/retiolum/hosts/rockit @@ -1,11 +1,11 @@ -Subnet = 10.243.199.33 -Subnet = 42:cec2:0a67:0ebb:7d97:8138:ac9a:8a58 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAnUtx3KPzNmS6/LxpYSolmhmF+Xqsum2po3lvmZszu2aIKdcAeIfb -B6bwz08zC9UNQjnO+27px5LMTTH9zhzRxo5xP/mcco2mVQFl5V+/73qBW5NnUV+4 -nPvUDi0+IhuVixHc+KlkxiHhgIDLdCN2WvVTkUCgxT2xVlPoESXq1dhdE3/5vvJt -0tphFUnP0sLCVzV25IYCocul+ELj8PAc/9mP4twifM4V0uwhh+J3AHR0+14QM61r -9qRhEnNEEkGeToYQPsoromiKPWczerUPBpaQHOpjnjg08Coz4OyrrM7+DXyspPfT -/862pAygKmeJMuzT2b52JbRlk3NMCxw5wQIDAQAB ------END RSA PUBLIC KEY----- +Subnet = 10.243.199.33 +Subnet = 42:cec2:0a67:0ebb:7d97:8138:ac9a:8a58 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAnUtx3KPzNmS6/LxpYSolmhmF+ +B6bwz08zC9UNQjnO+27px5LMTTH9zhzRxo5xP/mcco2mVQFl5V+/73qBW5NnUV+ +nPvUDi0+IhuVixHc+KlkxiHhgIDLdCN2WvVTkUCgxT2xVlPoESXq1dhdE3/ +0tphFUnP0sLCVzV25IYCocul+ELj8PAc/9mP4twifM4V0uwhh+J3AHR0+ +9qRhEnNEEkGeToYQPsoromiKPWczerUPBpaQHOpjnjg08Coz4OyrrM7+ +/862pAygKmeJMuzT2b52JbRlk3NMCxw5wQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From bfb071d7237e10ab21e6ce6fe0a0c8802e78f6fa Mon Sep 17 00:00:00 2001 From: makefu Date: Mon, 24 Mar 2014 13:57:33 +0100 Subject: wupps --- retiolum/hosts/rockit | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'retiolum') diff --git a/retiolum/hosts/rockit b/retiolum/hosts/rockit index a81d3148..e67272c3 100644 --- a/retiolum/hosts/rockit +++ b/retiolum/hosts/rockit @@ -2,10 +2,10 @@ Subnet = 10.243.199.33 Subnet = 42:cec2:0a67:0ebb:7d97:8138:ac9a:8a58 -----BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAnUtx3KPzNmS6/LxpYSolmhmF+ -B6bwz08zC9UNQjnO+27px5LMTTH9zhzRxo5xP/mcco2mVQFl5V+/73qBW5NnUV+ -nPvUDi0+IhuVixHc+KlkxiHhgIDLdCN2WvVTkUCgxT2xVlPoESXq1dhdE3/ -0tphFUnP0sLCVzV25IYCocul+ELj8PAc/9mP4twifM4V0uwhh+J3AHR0+ -9qRhEnNEEkGeToYQPsoromiKPWczerUPBpaQHOpjnjg08Coz4OyrrM7+ +MIIBCgKCAQEAnUtx3KPzNmS6/LxpYSolmhmF+Xqsum2po3lvmZszu2aIKdcAeIfb +B6bwz08zC9UNQjnO+27px5LMTTH9zhzRxo5xP/mcco2mVQFl5V+/73qBW5NnUV+4 +nPvUDi0+IhuVixHc+KlkxiHhgIDLdCN2WvVTkUCgxT2xVlPoESXq1dhdE3/5vvJt +0tphFUnP0sLCVzV25IYCocul+ELj8PAc/9mP4twifM4V0uwhh+J3AHR0+14QM61r +9qRhEnNEEkGeToYQPsoromiKPWczerUPBpaQHOpjnjg08Coz4OyrrM7+DXyspPfT /862pAygKmeJMuzT2b52JbRlk3NMCxw5wQIDAQAB -----END RSA PUBLIC KEY----- -- cgit v1.2.3 From a592e32c69cdacbfad1c2ac7c2b54c42155c0524 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 27 Mar 2014 13:15:13 +0100 Subject: remove legacy hosts --- retiolum/hosts/chinaman | 11 ----------- retiolum/hosts/geisha | 11 ----------- retiolum/hosts/heidi | 10 ---------- retiolum/hosts/monitoring | 7 ------- 4 files changed, 39 deletions(-) delete mode 100644 retiolum/hosts/chinaman delete mode 100644 retiolum/hosts/geisha delete mode 100644 retiolum/hosts/heidi delete mode 100644 retiolum/hosts/monitoring (limited to 'retiolum') diff --git a/retiolum/hosts/chinaman b/retiolum/hosts/chinaman deleted file mode 100644 index 60ea744e..00000000 --- a/retiolum/hosts/chinaman +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 10.243.64.163 -Subnet = 42:d3ef:d47b:531c:4314:ca07:a226:4064 - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAyVYuNcqYublIdsVS6DEnfCoxQONH8keQai2wyJn4fIvCHlOY/nH1 -l0IsGAa6zsBrg+EMfPUr+0Cw/+X6UcYLuHS8Zapv30Ye+BNrVUd16Vom0rCrcVKB -qweYoQGQPIWPNR5abVXwbP1zBuygzmBmEUFBzmYHFaRIMihqOii5wgBU2E9qaSs3 -wjT3ujARHYVoDRO6ifyzIqZ/F3DJ91j+FQkNfsgk8G2sV4h9WX4I13niwdzxGFHr -lUZIt1OKjhfgYGqBoULZ6g7Wk/aNwfbzETvesjiVr92fvR6I/QsjZK9A4v3mAyQ4 -p2yYCmOLU2IV/Q9mFhX0Y40lq0hpKksRkwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/geisha b/retiolum/hosts/geisha deleted file mode 100644 index 6a3a2788..00000000 --- a/retiolum/hosts/geisha +++ /dev/null @@ -1,11 +0,0 @@ -Subnet = 10.243.175.29 -Subnet = 42:b6aa:9052:fffc:807b:4829:8756:860c - ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA0kVV9ezFx/kZ6GvSALhXODkWlwHSjdA5hBJ90bdNcILeltVa3FIv -K2E+L6EG/jsETWKutxOk08+B/Z3p1SONgEksTNBdXx/Crww5PZGN/ocVSKZj61/N -lCej/Jcu88a4/R7JHIiSMdmqRCGHnwnxRA0iDQZIunriUH83NqMBQk6Drkphr/9a -5U8PhlqC5oSzZrg0uReRuBK86KmU03vp9/DndaLn18G835dtWRBQ2aEfIrrlaTPJ -ZKN/0xYZJU3v8YJYPi+UeRSymecSNgFQg36v95r3s4j3trk+yXVzVwT347AZRm4a -d/AHdk0+blXyUr5CFBsjA71cJfzqIIJJrwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/heidi b/retiolum/hosts/heidi deleted file mode 100644 index 5ba59846..00000000 --- a/retiolum/hosts/heidi +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.243.0.45 -Subnet = 42:7555:0ab6:6de2:e50a:a702:45b5:9fae/128 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA3Mp0dxGooYuoh/f+V+gdfDoG3izloxsNIJT8jPxZUPR8GE+Sn/Yc -bVfy7svy7AEyjQyxke5P58UpBB+D30XhO22Dr5mf9VGRcn6TYlM/u3FYxVNn+fhz -iN5oHeRjvJg58z9pdH/kHOtAPnVVEmjOGZxVO786JZ1obtRJ5Mx4aOHEaab1aThR -E7tcyT0xtPJfUARITVrLsFulGh0KaDb0bTADxBQiHSoRibCpraylOxF7tzbINqaX -ogMfYooGLutlEQJfOYsbmoTJX0caSK+9Y4njqpwkAx14P2ME6hfdYPrp82TtpOS3 -kOY3HAVTnHEsTxM4wDS7et316S5/BuW5rQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/monitoring b/retiolum/hosts/monitoring deleted file mode 100644 index e51c309d..00000000 --- a/retiolum/hosts/monitoring +++ /dev/null @@ -1,7 +0,0 @@ -Subnet = 42:82cb:f60c:6f27:611a:42f8:906c:2c70/128 -Subnet = 10.243.97.250/32 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAMjS8WxgbfJKVGRIFD0Bv+odQ7THNWDIcr1p4riVbOUPxtce+abasYGl -DOwaejcHP5bF11EAOOvdEtrivZReIZqYbMz5oWHLO6GCJn7nOCZVCW4LnUuNP3u8 -KQEU5oKj7LsKrBEEOtwpfNoWuZFzuzF0A6A2n+YYoea/Ak+hEbSbAgMBAAE= ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From b69448d5f154a5fef6bc020b2e7e727bfe9a51ed Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 27 Mar 2014 17:41:37 +0100 Subject: sync with retiolum/hosts --- retiolum/hosts/nfcgate_298dbf07 | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 retiolum/hosts/nfcgate_298dbf07 (limited to 'retiolum') diff --git a/retiolum/hosts/nfcgate_298dbf07 b/retiolum/hosts/nfcgate_298dbf07 deleted file mode 100644 index e3936b07..00000000 --- a/retiolum/hosts/nfcgate_298dbf07 +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.243.32.21 -Subnet = 42:9ca7:c370:a9d9:ee1b:623b:7fe6:5146 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEApPJKpk2vFwG0GSjl/Sg2IMfala2bOYSnTDO13AHIuybfmNr3H3O7 -exJ/ALN5lqnVOU5pL9GyORnAEEeaVI+eGJmQJwTtQExoLo3o12YT+mDV8YFYVqo8 -ZYQqxLlNO1gNKNDHPlZoCmwtavmv8jqGyitjCT8ZHDHiGl/ugddNOwfFHcSM1a9c -rAM4+D3Qu8YCIC3txcww77UtbFZVBQDG3UxkGbqNeD7Je1QHyZxPs0Oqj3aIYHLP -MW4H4360dW8+3U12bwYU4viD/uyCflrFvI2nY47GzF2MakC7UeUEiVDw7U9627wq -ra6GQebx7NRZjg/pTy77uxj7RFIHRFyIEQIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From 0e9739c5716db1ef34d3c61ea8b03f8d09faa79e Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 28 Mar 2014 23:46:44 +0100 Subject: readd heidi --- retiolum/hosts/heidi | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/heidi (limited to 'retiolum') diff --git a/retiolum/hosts/heidi b/retiolum/hosts/heidi new file mode 100644 index 00000000..c8af51b0 --- /dev/null +++ b/retiolum/hosts/heidi @@ -0,0 +1,11 @@ +Subnet = 10.243.124.21 +Subnet = 42:9898:a8be:ce56:0ee3:b99c:42c5:109e + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAqRLnAJNZ1OoO1bTS58DQgxi1VKgITHIuTW0fVGDvbXnsjPUB3cgx +1GEVtLc0LN6R9wrPKDaqHS6mkiRSDVScaW/FqkdFhTDaBJy8LfomL9ZmkU9DzkvQ +jncDjr0WoR+49rJHYsUULp1fe98Ev+y3VwVdJOOH92pAj1CAAUdtfG7XcGyHznYY +ZNLriGZe3l1AwsWMEflzHLeXcKQ/ZPOrjZ4EFVvfGfdQdJ24UUF3r4sBypYnasmA +q8lCw9rCrFh1OS6mHLC9qsvGfal6X4x2/xKc5VxZD4MQ/Bp7pBi1kwfHpKoREFKo +w/Jr3oG/uDxMGIzphGX185ObIkZ1wl/9DwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From f8c3b1d567707744e06eaf1686aec6e1fc1c0e2b Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Mar 2014 21:30:21 +0200 Subject: new host k2 from momorientes --- retiolum/hosts/k2 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/k2 (limited to 'retiolum') diff --git a/retiolum/hosts/k2 b/retiolum/hosts/k2 new file mode 100644 index 00000000..f0f17f7f --- /dev/null +++ b/retiolum/hosts/k2 @@ -0,0 +1,11 @@ +Subnet = 10.243.97.72 +Subnet = 42:717e:2a17:e7ff:eb6f:b760:5af4:7da9 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA4OFqfrNMvGfJDH+QyV/FLVfflaAgmyljJ3Sl0CIrC1Xiv0ha2PRu +C6CNPk1qWHP6w4gfWtMh/Es7zonTON0AEfAt2LJXl85eArTS2dp1cO1KqfzagWtP +KzkvuNIKZ8Zg4uJ8D4/G5CFHEE4oGKFSgcasAHZ8y1/adFf3xEM/9D+CKMD4o11e +lMpnxTKFGMI6HbiSv2sKHmwc+kEUo1vWRJpXZn8mW4uwLT3PPEvCd3YEszVrEhhv +qlSZqYU0L9idVDH8krQtJkn2ogIhfe+Xs4KaL7Lkv3XihcKYsgHpKJY0G6c/xtZO +pj8MCpPVAY2dNFWFPUEXWwWyeO9tAyN6CQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 5cd26733b09a4fad1361ac4d400c687db7058490 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 30 Mar 2014 21:51:41 +0200 Subject: new host: momorientes makalu --- retiolum/hosts/makalu | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/makalu (limited to 'retiolum') diff --git a/retiolum/hosts/makalu b/retiolum/hosts/makalu new file mode 100644 index 00000000..3d080ca5 --- /dev/null +++ b/retiolum/hosts/makalu @@ -0,0 +1,11 @@ +Subnet = 10.243.90.132 +Subnet = 42:5ee8:8626:f03e:bdf1:562d:94d1:f395 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEArFuedyPX7kDeH2GwYD3UcRoFjGpTBJXjJzm3LoleyXOeYSdkZZ3d +ljIeEq9alf6UtqEvYH2HfX8m9fEcHxwFMmJ1CPEwkDZI2IgbLOYV0x2MWLShEvtC +vGeNyPt+TdiDqDhN8EyRvhB/KzEXdbCUZ79htf8lRonNLYPSRNh58CTZ18T/+3iF +vy6igdpj4JiLGzdXEggO0KToW5ZVCRjuEaH65BlXdjkCM0dk28FJGh/oakv7hjlZ +M6c3HJY5RAygO4uLWOyB37j38GDAseDYnNwnLt4jCk7gO48SnsS77efEghEMVVXK +qnSKbX0KCSvVOJbrvVyP/16o2521eGl3MQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 9ebda78fd9b84d783253750d92f356549aab1a4e Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 31 Mar 2014 00:55:53 +0200 Subject: new host momorientes: monitor --- retiolum/hosts/monitor | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/monitor (limited to 'retiolum') diff --git a/retiolum/hosts/monitor b/retiolum/hosts/monitor new file mode 100644 index 00000000..8584f70b --- /dev/null +++ b/retiolum/hosts/monitor @@ -0,0 +1,11 @@ +Subnet = 10.243.227.145 +Subnet = 42:2ae3:6ed3:a317:d0be:022f:6343:1de8 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAlNDrSskoSPInRiO8JW529o178D2kDdHbt3zZklM+jveFZuynDH2/ +WTfxr7wAIUd26jb12/6zLZ/gnEikLd3LpYiTA1J+ZL2c5SvXOoIqTU3Q3dwEecG2 +qwLcZ8UCjjOKiwWmjGHhNgEx/XUF7gpMwXb/m7fqzTGEiQozaCnQ3ZJA4t8GG00Z +PZnDZHj8xYtXK3c3vOUa11xj9/dOwZb9e+VON0bXJxvxh+C7XkLO3NYTayyRX9qL ++OOdRLSkzINzoj94+juPepCEQtRusrIbOkSPwCl2u29rKRNfPBkqbAcN3zP1mfDC +IXNqUobWP8xvSLyBZh5zglcbQbczxMkKiwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 6cada3469c50f5d2addcaf5a5ea7130c7b3f9d9b Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 17 Apr 2014 22:25:16 +0200 Subject: add x2 --- retiolum/hosts/x2 | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/x2 (limited to 'retiolum') diff --git a/retiolum/hosts/x2 b/retiolum/hosts/x2 new file mode 100644 index 00000000..bd099621 --- /dev/null +++ b/retiolum/hosts/x2 @@ -0,0 +1,11 @@ +Subnet = 10.243.201.239 +Subnet = 42:9f63:ce4a:0803:7641:18de:c23e:920b + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEArHKsP/4mnxRaTS8PB5pXh+Nz+dWRft6aIeoAuvTb2ZKTWml9hJow +VBEG/MB9DCCQI/Lf3b3YyHS3kL4BhC/whpgGtl26zfnoKamxXL+ZEvxWRt+O1PKW +OegmFYaANKIW/FPGDS/Thl2nAbXCiJ6a29UyFuwfZYxLYIAh9sPvgV+Aps9PwbZL +vwgdhekhRWQfXrKVS/B76dY0zTIbCf74kOOiAHM+xeOsBUCaI9govr1wNavyiM5P +acJq2Q8X4pcCTnXsS3JOjyyK7idYyv0VLAokolyShrEGfYk0kCTugLiX+wawfxhK +O0JvWo0+HrxSdYI1jhBQePlwx/FszJ907wIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From c25a00dca1af27a95ccbc521075375d1df866914 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 20 Apr 2014 17:46:41 +0200 Subject: retiolum/hosts: add dei --- retiolum/hosts/dei | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/dei (limited to 'retiolum') diff --git a/retiolum/hosts/dei b/retiolum/hosts/dei new file mode 100644 index 00000000..0d401b01 --- /dev/nu