From 688d3a6bfb6b7c0c883c6392f249b17f6f3dd67b Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 16 Feb 2012 01:36:06 +0100 Subject: retiolum hosts: 42/8 -> 10 --- retiolum/hosts/also | 3 ++- retiolum/hosts/bergwerk | 3 ++- retiolum/hosts/destroy | 3 ++- retiolum/hosts/eigenserv | 3 ++- retiolum/hosts/iiso | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) (limited to 'retiolum') diff --git a/retiolum/hosts/also b/retiolum/hosts/also index 42d54ae2..23e67186 100644 --- a/retiolum/hosts/also +++ b/retiolum/hosts/also @@ -1,6 +1,7 @@ Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 Subnet = 23.42.0.1/16 -Subnet = 42.84.79.215/32 +Subnet = 10.243.0.50 +Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry Euy3v3s0ps/GMdE52gUbFB+bhM99hHiKW+7zcxnoMJ69a9yK6VG0Im+7ib0WTliZ diff --git a/retiolum/hosts/bergwerk b/retiolum/hosts/bergwerk index 43f6c1ba..bed835b1 100644 --- a/retiolum/hosts/bergwerk +++ b/retiolum/hosts/bergwerk @@ -1,5 +1,6 @@ Subnet = 42:a7ff:3577:0526:3986:650f:c175:30a5/128 -Subnet = 42.246.229.109/32 +Subnet = 10.243.0.51 +Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuCX8FVI6xQepPf0goaErA35grHcBNbYvzKIXzEIOEuxiVLX4FXoY aHdUaz9Z2/rECuDQCVzke3TLZgBn9ai7ruT5U077h0q69pS/vI/Hr2e3s50tQVcu diff --git a/retiolum/hosts/destroy b/retiolum/hosts/destroy index 9f624c6f..0a22fb71 100644 --- a/retiolum/hosts/destroy +++ b/retiolum/hosts/destroy @@ -1,5 +1,6 @@ Subnet = 42:9277:1f1e:7599:ae4b:7cca:b4a3:fe47/128 -Subnet = 42.24.21.32/32 +Subnet = 10.243.0.31 +Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAofIF/j4ddJEG0sOJJNp6hVXqLpj9FPw6a1vLLqZsn/NuZi3QCZ/w xj1nIsQbc1TnPLluHhpn5kuvzb0lThqmPJvX2uXnbq7WH6OvRyN/FV/Gn40txdni diff --git a/retiolum/hosts/eigenserv b/retiolum/hosts/eigenserv index ff61b3f6..518eaf82 100644 --- a/retiolum/hosts/eigenserv +++ b/retiolum/hosts/eigenserv @@ -1,5 +1,6 @@ Subnet = 42:c9d8:ab9e:c7fe:43ff:0268:f862:42f7/128 -Subnet = 42.136.75.187/32 +Subnet = 10.243.0.32 +Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAyy060LWeo6Z+Kp2h5LtyMx+KGdxL9/WjWfc1yf/YZ8lhZutNb+Kd u9AHbnrqTRWRslP+toNiC55aJ/KlTBFQA5nBu2DC1KdG71AX5th7bRvUMfEAEG1+ diff --git a/retiolum/hosts/iiso b/retiolum/hosts/iiso index 63711f9e..e41e216c 100644 --- a/retiolum/hosts/iiso +++ b/retiolum/hosts/iiso @@ -1,5 +1,6 @@ Subnet = 42:b2cd:6c75:d528:e736:ec4e:fc39:8bdc/128 -Subnet = 42.251.230.3/32 +Subnet = 10.243.0.37 +Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAvsjBR0FUkjiNNLhz3AArosLqEiLZY7O8L6LorfUplD/IjG9P7XXx ry4gbKEH57GPn11IOPP1AKQcz7SfW7EwvUS8U1IZgkQq8BuuD3oGBQxOqwnOwzVN -- cgit v1.2.3 From 5b4828f8d8005dcb691a7a834456825bf2b81206 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 16 Feb 2012 02:24:36 +0100 Subject: retiolum hosts += /32 --- retiolum/hosts/Shepherd | 2 +- retiolum/hosts/ThinkArmageddon | 2 +- retiolum/hosts/also | 2 +- retiolum/hosts/bergwerk | 2 +- retiolum/hosts/destroy | 2 +- retiolum/hosts/eigenserv | 2 +- retiolum/hosts/euer | 2 +- retiolum/hosts/fuerkrebs | 2 +- retiolum/hosts/iiso | 2 +- retiolum/hosts/pornocauster | 2 +- retiolum/hosts/taschenkrebs | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'retiolum') diff --git a/retiolum/hosts/Shepherd b/retiolum/hosts/Shepherd index 1477b3f6..4b6c5f42 100644 --- a/retiolum/hosts/Shepherd +++ b/retiolum/hosts/Shepherd @@ -1,4 +1,4 @@ -Subnet = 10.243.0.145 +Subnet = 10.243.0.145/32 Subnet = 42:0f19:8a1e:7865:721b:2378:beef:1158/128 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsW0Pbgvl+hATKqQR6H4yPg1kphMsxrXvh/CMQY8dXVVD2mDWBHaL diff --git a/retiolum/hosts/ThinkArmageddon b/retiolum/hosts/ThinkArmageddon index cec62e11..e51e1c92 100644 --- a/retiolum/hosts/ThinkArmageddon +++ b/retiolum/hosts/ThinkArmageddon @@ -1,4 +1,4 @@ -Subnet = 10.243.0.137 +Subnet = 10.243.0.137/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA1EAiyBWICkyB1zHE31fHSbGR1nJJmXSfnrqm9yXRZSGweIKrbsof QVcRzM4vsFBRUMBeKW7fzlGcvgXULFRnGelvEl4GRiBMO9odBlBI3t8CjZW7X2N7 diff --git a/retiolum/hosts/also b/retiolum/hosts/also index 23e67186..59a251a7 100644 --- a/retiolum/hosts/also +++ b/retiolum/hosts/also @@ -1,6 +1,6 @@ Subnet = 42:9c90:a590:e88a:52cf:126f:b710:1a9c/128 Subnet = 23.42.0.1/16 -Subnet = 10.243.0.50 +Subnet = 10.243.0.50/32 Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsnF1eyd/R4qXMGo8UEZ98hnJK+6ZEKUubgdzEwAuSxK40B6nX8Ry diff --git a/retiolum/hosts/bergwerk b/retiolum/hosts/bergwerk index bed835b1..89aa7ca5 100644 --- a/retiolum/hosts/bergwerk +++ b/retiolum/hosts/bergwerk @@ -1,5 +1,5 @@ Subnet = 42:a7ff:3577:0526:3986:650f:c175:30a5/128 -Subnet = 10.243.0.51 +Subnet = 10.243.0.51/32 Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAuCX8FVI6xQepPf0goaErA35grHcBNbYvzKIXzEIOEuxiVLX4FXoY diff --git a/retiolum/hosts/destroy b/retiolum/hosts/destroy index 0a22fb71..8b5f7f5a 100644 --- a/retiolum/hosts/destroy +++ b/retiolum/hosts/destroy @@ -1,5 +1,5 @@ Subnet = 42:9277:1f1e:7599:ae4b:7cca:b4a3:fe47/128 -Subnet = 10.243.0.31 +Subnet = 10.243.0.31/32 Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAofIF/j4ddJEG0sOJJNp6hVXqLpj9FPw6a1vLLqZsn/NuZi3QCZ/w diff --git a/retiolum/hosts/eigenserv b/retiolum/hosts/eigenserv index 518eaf82..f5966794 100644 --- a/retiolum/hosts/eigenserv +++ b/retiolum/hosts/eigenserv @@ -1,5 +1,5 @@ Subnet = 42:c9d8:ab9e:c7fe:43ff:0268:f862:42f7/128 -Subnet = 10.243.0.32 +Subnet = 10.243.0.32/32 Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAyy060LWeo6Z+Kp2h5LtyMx+KGdxL9/WjWfc1yf/YZ8lhZutNb+Kd diff --git a/retiolum/hosts/euer b/retiolum/hosts/euer index 6e965f83..8a38150f 100644 --- a/retiolum/hosts/euer +++ b/retiolum/hosts/euer @@ -1,6 +1,6 @@ Address = 84.23.67.119 Subnet = 42:974a:3ecf:3c49:06c0:4cd1:3c6f:59d9/128 -Subnet = 10.243.0.95 +Subnet = 10.243.0.95/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEArx2mZOPEfS8fvmQYSzWuMmNtfposJlctDfGVmhMVotaFIpIBcKuL dHZHI8BAStaM++DuqKv/QBjk9jF6BRAdZqHn98LHXR+VRJmFvgelEFe0uPvIRMe2 diff --git a/retiolum/hosts/fuerkrebs b/retiolum/hosts/fuerkrebs index 7e7713cc..35bbcf18 100644 --- a/retiolum/hosts/fuerkrebs +++ b/retiolum/hosts/fuerkrebs @@ -1,5 +1,5 @@ Subnet = 42:0f19:8a1e:7865:721b:2378:bef7:1159/128 -Subnet = 10.243.0.144 +Subnet = 10.243.0.144/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA1HoKqh7HvXCKybe2FNBI/wuOvkZuftL0/DDZfZtPlCRtdcOA4XFj hQng5+VE3NG0yKcRs59U8iHSeN9b7Is1YF4q0RtM9YQTDhvS/vfpHDq42ftjMs/e diff --git a/retiolum/hosts/iiso b/retiolum/hosts/iiso index e41e216c..3700cec5 100644 --- a/retiolum/hosts/iiso +++ b/retiolum/hosts/iiso @@ -1,5 +1,5 @@ Subnet = 42:b2cd:6c75:d528:e736:ec4e:fc39:8bdc/128 -Subnet = 10.243.0.37 +Subnet = 10.243.0.37/32 Compression = 9 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAvsjBR0FUkjiNNLhz3AArosLqEiLZY7O8L6LorfUplD/IjG9P7XXx diff --git a/retiolum/hosts/pornocauster b/retiolum/hosts/pornocauster index 83374198..cc7d8955 100644 --- a/retiolum/hosts/pornocauster +++ b/retiolum/hosts/pornocauster @@ -1,5 +1,5 @@ Subnet = 42:0b2c:d90e:e717:03dc:9ac1:7c30:a4db/128 -Subnet = 10.243.0.91 +Subnet = 10.243.0.91/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAnztrijsfao+fmNtwAjqwIDKsRaMP3ECsq2T2zqKvxwCyXk69G9bG RFhWjgaawS9ZhnHSlgWK/vtoR0O9NxpzdU/mvdQijbVGxM02DegjO9qDSIe8EGmA diff --git a/retiolum/hosts/taschenkrebs b/retiolum/hosts/taschenkrebs index 07be2450..94c37ead 100644 --- a/retiolum/hosts/taschenkrebs +++ b/retiolum/hosts/taschenkrebs @@ -1,4 +1,4 @@ -Subnet = 10.243.0.66 +Subnet = 10.243.0.66/32 Subnet = 42:55bf:5f2b:73f4:f989:910e:ee73:2831/128 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From 1ae99cfbcb3340ba80ea41d2f001ae0f1357444c Mon Sep 17 00:00:00 2001 From: miefda Date: Thu, 23 Feb 2012 13:57:34 +0100 Subject: added myself to hosts --- retiolum/hosts/miefda | 11 +++++++++++ retiolum/scripts/tinc_setup/write_channel.py | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 retiolum/hosts/miefda (limited to 'retiolum') diff --git a/retiolum/hosts/miefda b/retiolum/hosts/miefda new file mode 100644 index 00000000..1de261d9 --- /dev/null +++ b/retiolum/hosts/miefda @@ -0,0 +1,11 @@ +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/scripts/tinc_setup/write_channel.py b/retiolum/scripts/tinc_setup/write_channel.py index 53a155d9..8299fa8d 100644 --- a/retiolum/scripts/tinc_setup/write_channel.py +++ b/retiolum/scripts/tinc_setup/write_channel.py @@ -3,7 +3,7 @@ import random, sys, time, socket try: myname=sys.argv[1] except: - print "you are made of stupid" + print("you are made of stupid") exit (23) CHANNEL = '#krebsco' @@ -12,10 +12,10 @@ FILE="/etc/tinc/retiolum/hosts/"+myname PORT=6667 NICK= myname+"_"+str(random.randint(23,666)) -print "Connecting..." +print("Connecting...") sock = socket.socket(socket.AF_INET,socket.SOCK_STREAM) sock.connect((HOST,PORT)) -print NICK +print(NICK) sock.send("NICK %s\r\n" % NICK) sock.send("USER %s %s bla : %s\r\n" %(NICK,HOST,NICK)) sock.send("JOIN %s\r\n" % CHANNEL) @@ -23,5 +23,5 @@ time.sleep(23) f = open(FILE,'r') a = [ sock.send("PRIVMSG %s : %s" % ( CHANNEL,line)) for line in f] time.sleep(5) #because irc is so lazy -print "closing socket" +print("closing socket") sock.close() -- cgit v1.2.3 From 1f36c0a7b2ca65a496b2ac6e67abd1959f469a0e Mon Sep 17 00:00:00 2001 From: miefda Date: Thu, 23 Feb 2012 14:07:16 +0100 Subject: deleted old nodes --- retiolum/hosts/miefda901 | 10 ---------- retiolum/hosts/miefdahome | 9 --------- 2 files changed, 19 deletions(-) delete mode 100644 retiolum/hosts/miefda901 delete mode 100644 retiolum/hosts/miefdahome (limited to 'retiolum') diff --git a/retiolum/hosts/miefda901 b/retiolum/hosts/miefda901 deleted file mode 100644 index ab25a691..00000000 --- a/retiolum/hosts/miefda901 +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:0:0:0:0:0:111:efda/128 -Subnet = 42.85.219.211/32 ------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/retiolum/hosts/miefdahome b/retiolum/hosts/miefdahome deleted file mode 100644 index c21ba679..00000000 --- a/retiolum/hosts/miefdahome +++ /dev/null @@ -1,9 +0,0 @@ -Subnet = 42.37.203.172/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAtKNWDTK92VGAqfkoy+cWscq3Gp3UJv+NldFGny/PZHG7/0zT7Fri -VDG+XhVkY5lXz2FyRWPsxwZBEQJlnjswx5zpNsjwCS29a4fTw9lnc26KRSXfGW56 -V/ow2xaPF+n6e9aebOf660FfK10RcBsBAJ956UelahiuwTTXqEnnA0zA0tpJWAdU -KG+jYARZj2kGy+Trr1ud/PUUXoy+pxID0SW0Xj0l1soxkNEPf2kLwBpaQrwI7uxf -VI+chpR7ZXJOEBj2vevIVOtxX6X9TubEp3WQfiQzOHB1uW8okHI0wEY5zwrozga/ -xAFGktiwuux1pNdcCUyZmvhTKkHS6gyw4wIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From 34910f48665069d147bc608dd71a38051d12df6e Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 26 Feb 2012 17:16:48 +0100 Subject: added albi7 --- retiolum/hosts/albi7 | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/albi7 (limited to 'retiolum') diff --git a/retiolum/hosts/albi7 b/retiolum/hosts/albi7 new file mode 100644 index 00000000..0a21107e --- /dev/null +++ b/retiolum/hosts/albi7 @@ -0,0 +1,10 @@ +Subnet = 10.243.0.7/32 +Subnet = 42:6c61:6962:6137:626c:3769:000a/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA+SwdWv1anjIaKSnvel9d23tgqye5RguIVfgMnjpMsqOYpFklLIa8 +4wREhVvpiArnIsoTXbKzdeCFgaAbMS6aQ701Pyv7QriVy8m3iUlgqvB/znogxN8U +z1fqL0jAHLkQkoyZ2a6mUgHpByvUqZNcq6istYLwGnXO3JQrS7U54hHPpXbxwFY5 +0/Wli9OueG4fWaZ9skDa2Faq4c/Lngku+Iv1gBBgII1EDSsgedNWw3YBTmHDFNTZ +SsORj2ho5nQgdvw42qEINbxpU01jK8XB+jmVEO+ixZZCsWlOeCjl9Zym4MZDRePg +euTLTbgs/809ElM8V+EzRKSPNR2k6FrBXwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From aac7be81fd1c430a86e1f1d3a17a329f5344e8e8 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Feb 2012 00:24:15 +0100 Subject: moved to new range --- retiolum/hosts/pico | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/hosts/pico b/retiolum/hosts/pico index 83a465a4..8fc732b8 100644 --- a/retiolum/hosts/pico +++ b/retiolum/hosts/pico @@ -1,4 +1,5 @@ -Subnet = 42.0.0.42 +Address = pu11.de +Subnet = 10.243.0.102/32 Subnet = 42:b103:275c:1723:edc8:b24d:452b:352a/128 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAsbe4wzTOHHLyuPO/AsfDqQHyV41qgs3dqt6uWcDcdiEsUvbCK9Ch -- cgit v1.2.3 From 84be6f0b71b92949fad4e246fc703d98dd7b4835 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Feb 2012 01:32:37 +0100 Subject: added openwrt stuff --- retiolum/openwrt/updater | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 retiolum/openwrt/updater (limited to 'retiolum') diff --git a/retiolum/openwrt/updater b/retiolum/openwrt/updater new file mode 100755 index 00000000..441bfbe2 --- /dev/null +++ b/retiolum/openwrt/updater @@ -0,0 +1,5 @@ +#!/bin/sh +cd /etc/tinc/retiolum/hosts +wget http://vpn.miefda.org/hosts.tar.gz +tar xzf hosts.tar.gz +rm hosts.tar.gz -- cgit v1.2.3 From e4907be02b6c650ca85ef2d74f7f64ffadc885fb Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Feb 2012 01:33:33 +0100 Subject: added tinc-up for owrt --- retiolum/openwrt/tinc-up | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 retiolum/openwrt/tinc-up (limited to 'retiolum') diff --git a/retiolum/openwrt/tinc-up b/retiolum/openwrt/tinc-up new file mode 100755 index 00000000..3b8bb978 --- /dev/null +++ b/retiolum/openwrt/tinc-up @@ -0,0 +1,19 @@ +# source: krebscode/painload/retiolum/scripts/tinc_setup/tinc-up + +dirname="`dirname "$0"`" + +conf=$dirname/tinc.conf + +name=`sed -n 's|^ *Name *= *\([^ ]*\) *$|\1|p' $conf` + +host=$dirname/hosts/$name + +addr4=`sed -n 's|^ *Subnet *= *\(10[.][^ ]*\) *$|\1|p' $host` +if [ "$addr4" != '' ];then + ifconfig $INTERFACE $addr4 + route add -net 10.243.0.0 netmask 255.255.0.0 dev retiolum +else + addr4=`sed -n 's|^ *Subnet *= *\(42[.][^ ]*\) *$|\1|p' $host` + ifconfig $INTERFACE $addr4 + route add -net 42.0.0.0 netmask 255.0.0.0 dev retiolum +fi -- cgit v1.2.3 From caa9e92f16e0534528fe0107d386cc8da128f90b Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Feb 2012 01:34:37 +0100 Subject: added minikrebs --- retiolum/hosts/minikrebs | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/minikrebs (limited to 'retiolum') diff --git a/retiolum/hosts/minikrebs b/retiolum/hosts/minikrebs new file mode 100644 index 00000000..ad7278e2 --- /dev/null +++ b/retiolum/hosts/minikrebs @@ -0,0 +1,10 @@ +Subnet = 10.243.1.1/32 +Subnet = 42:0:0:0:0:0:1:1/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA0fu8F+XJ6hHsIj8QtdSZIhE+Ae2sEIY4dHcnHbCOeHJlOQQDJrme +frmG65BX4BMcClUyhvvMwlZIerFwsJoEwa39lB3/Y58OwSS9cNCZTShQPbyVy5wo +oS97tVUyQENMELXgodg7CUNaloVXGOyXgCOkfYOb5CpWi8NXNsSE1CjZc1XZNI2Q +2dFBzp6FtRcKc5x5xWuUMnw1Ll2upW2uHZWfgRtgv+pzxVTiNvDqACu8Klwj0bls +B87DEYeUmiC+CioOtyhiQimUGE8lU1aMaqCyfSsqeBEclSvOCnpaEQu4j6aiY8SE +5Gm+rteYWKfK2LYV2NOg7n9AUR6d0v8P2wIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From e9e766c4fb7799ee3c41c0e94c0276431a9b8d66 Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 27 Feb 2012 01:43:52 +0100 Subject: now with HUP signal --- retiolum/openwrt/updater | 1 + 1 file changed, 1 insertion(+) (limited to 'retiolum') diff --git a/retiolum/openwrt/updater b/retiolum/openwrt/updater index 441bfbe2..4dbc7d78 100755 --- a/retiolum/openwrt/updater +++ b/retiolum/openwrt/updater @@ -3,3 +3,4 @@ cd /etc/tinc/retiolum/hosts wget http://vpn.miefda.org/hosts.tar.gz tar xzf hosts.tar.gz rm hosts.tar.gz +tincd -n retiolum -kHUP -- cgit v1.2.3 From d30aceebb56efac0b775570c5880b9bb66319bc0 Mon Sep 17 00:00:00 2001 From: lassulus Date: Tue, 28 Feb 2012 00:12:09 +0100 Subject: added box --- retiolum/hosts/box | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/box (limited to 'retiolum') diff --git a/retiolum/hosts/box b/retiolum/hosts/box new file mode 100644 index 00000000..e02f8ca6 --- /dev/null +++ b/retiolum/hosts/box @@ -0,0 +1,10 @@ +Subnet = 10.243.43.43 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvUMfRZOPb/zKvALZTyxKQuzowqqJ/HW2lm/RIOKL2uoTUgVX1DJB +fCLf66e2fHnjnStXuaMDNs1kq2gi4EyK5Q50RxVBq7XayXYqfnFwzTE+Iqape542 +vYSWKLdrxljln8a2EYU7njtcWkTpW+cJIwSHEUkDLAowF87ElQ0gBmyX4p107pow +jg7zcYierVdQXkI7mO4g2zWsywfhwscbu5hdCp1Fw3wHFDatgyhPj1pJruKe+O3c +AebF5yQOAsCxAk8ZcwGLmmF5xK7lAeux2Qzu1B4Pkfxi97g1GVLnX+so7PR+vvkQ ++OMzQGIWXtaOqov5q2O1N5RJzng/kCjC/QIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From d802ca802b6916e44297885bc3bb1fc06c84ed3c Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 10 Mar 2012 22:47:23 +0100 Subject: Retiolum: prepare renewal of Shepherds Key --- retiolum/hosts/Shepherd | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 retiolum/hosts/Shepherd (limited to 'retiolum') diff --git a/retiolum/hosts/Shepherd b/retiolum/hosts/Shepherd deleted file mode 100644 index 4b6c5f42..00000000 --- a/retiolum/hosts/Shepherd +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 10.243.0.145/32 -Subnet = 42:0f19:8a1e:7865:721b:2378:beef:1158/128 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAsW0Pbgvl+hATKqQR6H4yPg1kphMsxrXvh/CMQY8dXVVD2mDWBHaL -Y/yXCanDxyYRGu80SVwdIUWQIwjGD0SiESRGqABl2qPsD1uIbbqI5SlSwzb8UrJk -+oCszLxZrhD14HWTjAduQ5GcBNZ8Ht133rR07s+XRAYcKJOMauod3yD3g3IfZw6L -/MAQ8GSptSa+JPm5Kk1/QBZi8oH0aIseaVH9b6l8+P27LwxdwJG+S/82iKOUvszw -qocqNbKJ0iySs3ZPZTDpKa/MPAN9H/m/OqM66w6IG4iwIttqix5mET+kM2TUaH29 -tApWA1ChYy61aKBykdcT+IbJHl/0unOU6QIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From 4aa0bab545f5f28200ea16ee581d6eff39e94d6d Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 10 Mar 2012 22:50:44 +0100 Subject: fix Makefile in case tincd does not yet exist --- retiolum/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'retiolum') diff --git a/retiolum/Makefile b/retiolum/Makefile index cd0a543c..ee1526d4 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -17,13 +17,13 @@ install: upgrade upgrade: update if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; \ - sudo bin/restart-tincd; \ + sudo bin/restart-tincd || :; \ fi update: hosts - bin/update_tinc_hosts "create magic" || true + bin/update_tinc_hosts "create magic" || :; bin/update_tinc_hosts restart sudo pkill -HUP tincd || :; hosts: - bin/update-retiolum-hosts || true + bin/update-retiolum-hosts || :; -- cgit v1.2.3 From b64eb207e73a9d166483c811c827692201bf732f Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 10 Mar 2012 22:51:36 +0100 Subject: fix broken punani call --- retiolum/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'retiolum') diff --git a/retiolum/Makefile b/retiolum/Makefile index ee1526d4..668ee58e 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -9,9 +9,9 @@ links: install: upgrade - ../punani/bin/punani tinc python + ../punani/bin/punani install tinc python scripts/tinc_setup/install.sh - cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up + sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up scripts/autostart/create-startup.sh upgrade: update -- cgit v1.2.3 From 42a451c9b6a078c9c3c7890b3e785c6ddad13625 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 10 Mar 2012 23:51:32 +0100 Subject: fixed filebitch --- retiolum/hosts/filebitch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch index 523ff7ff..d23f98f2 100644 --- a/retiolum/hosts/filebitch +++ b/retiolum/hosts/filebitch @@ -1,5 +1,5 @@ Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b/128 -Subnet = 10.143.131.98/32 +Subnet = 10.243.131.98/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEAoqTUa54dkplzU6IqWdvCiGM8FLpZ6X6AmgGgl5r9RZ+Af08iy4Js FPdco+1Lj5OthXJnd5Xx8cO5qQx5CRzUN59ec8o0jxQOBZ5EpuN42RLMmQNBJWm7 -- cgit v1.2.3 From 6f7aedc4efde70631cadc92cb42e743fc7a90e3b Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 11 Mar 2012 00:18:27 +0100 Subject: retiolum: renew Shepherd key --- retiolum/hosts/Shepherd | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/Shepherd (limited to 'retiolum') diff --git a/retiolum/hosts/Shepherd b/retiolum/hosts/Shepherd new file mode 100644 index 00000000..875f62e2 --- /dev/null +++ b/retiolum/hosts/Shepherd @@ -0,0 +1,11 @@ +Subnet = 10.243.0.133 +Subnet = 42:2be0:92f5:3546:5f0f:8f22:6244:25f4/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAwkkmkhGMnI0x5VIgdLwV2SvXO9Bw3Sy1U5AToZiG2dSB+OiwwLir +JIrTHv4r73lMLROJjQhznq06VMmNviC82178H7/DZqgSqlGU7d9p1Okd5XCs6LI3 +eaL5mYTXFuA+PMHVvYqQ5fDQRQ4KoWmlSV65XUPejPlxtl3FXqOSHVuuBSbka+St +qLyWLAh9d8AfWjxbAIv41fl6WOyw2IuDc05K36aT/TwzA3ykl+ekNObAjvpI0cxI ++d3j8H8JY5jDcg1hvWT06JqpUcTJRkWLL7BBdQvWySaBcET1Flfo8eYVqVQDK4kU +XV/tA1ax7YPFBQ7Lh3Ru9nEC45Gv6R4HbwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 5e46704e8d4acbfe8db22d47a95fd98683b7c889 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 14 Mar 2012 23:09:45 +0100 Subject: add senderechner --- retiolum/hosts/senderechner | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/senderechner (limited to 'retiolum') diff --git a/retiolum/hosts/senderechner b/retiolum/hosts/senderechner new file mode 100644 index 00000000..4cce73ca --- /dev/null +++ b/retiolum/hosts/senderechner @@ -0,0 +1,10 @@ +Subnet = 10.243.0.163 +Subnet = 42:b67b:5752:a730:5f28:d80d:6b37:5bda/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA0zCc5aLVRO6NuxUoR6BVzq2PQ/U5AEjYTdGkQufRot42N29MhxY7 +lJBfPfkw/yg2FOzmAzTi62QyrLWSaF1x54rKu+JeNSsOAX+BorGhM67N45DGvJ0X +rakIL0BrVoV7Kxssq3DscGVbjbNS5B5c+IvTp97me/MpuDrfYqUyZk5mS9nB0oDL +inao/A5AtOO4sdqN5BNE9/KisN/9dD359Gz2ZGGq6Ki7o4HBdBj5vi0f4fTofZxT +BJH4BxbWaHwXMC0HYGlhQS0Y7tKYT6h3ChxoLDuW2Ox2IF5AQ/O4t4PIBDp1XaAO +OK8SsmsiD6ZZm6q/nLWBkYH08geYfq0BhQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From fe92435af091261b023a2b8b72af054e960ccb45 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 21 Mar 2012 19:16:19 +0100 Subject: retiolum:add radiotux team --- retiolum/hosts/radiotuxmini | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/radiotuxmini (limited to 'retiolum') diff --git a/retiolum/hosts/radiotuxmini b/retiolum/hosts/radiotuxmini new file mode 100644 index 00000000..96c06931 --- /dev/null +++ b/retiolum/hosts/radiotuxmini @@ -0,0 +1,11 @@ +Subnet = 10.243.0.185 +Subnet = 42:5553:9d1f:5e66:ed7f:bbd6:b7fd:51b2/128 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEA3A0wJPSrNGpb3g98iv1EDTk7s9dgUKSHf7rmqrN2IlW9g21pkGEY +T3EWz5X8mGEQbDw2im9W8Lm7OSnYuRQjNxacq5WMIN3AGpsiGB6KWEXu73lDWDkE +hL7dxjSWFSQQMUkbjhduxyaibmLLI748w5npYzhAsjICs4MsrBhcL/ER7tCwVyKm +AEKUBbLd21tVLGM5dapJslKamZ5NxeHY6TBdtbd2AQZ+67EINKt/WEx9Ruw/t57P +OAa37NhFrjBbRClQQZVOunbh1Sb0EX3Abj4oZczrtAaBfcDQbA7x2LwbqugZH/EN +i/oa3sCqOLo7ZcYvuvyxaZgWLK3KB2MEQwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 170da4aaf1ba4b961b6c33c5ca0c8e8613321fee Mon Sep 17 00:00:00 2001 From: death Date: Thu, 29 Mar 2012 17:24:27 +0200 Subject: added laqueus --- retiolum/hosts/laqueus | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/laqueus (limited to 'retiolum') diff --git a/retiolum/hosts/laqueus b/retiolum/hosts/laqueus new file mode 100644 index 00000000..cf4ecad5 --- /dev/null +++ b/retiolum/hosts/laqueus @@ -0,0 +1,11 @@ +Subnet = 42:0:0:0:0:0:0:1a1a/128 +Subnet = 10.243.0.12/32 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAy9lnH4qDSYeNbpzpcQyq2LzzxkVy2N1vGgKkVttzx0cgMvyRm3aX +wlacS+3ILBZ3tw+JuCKR9gjRluwKkqoReEINcAam/GbubJ6QBpV54goYm7YGOIuf +GkbWVk7Kts67KWWhZDzEL30GRv94K6e+m8e7rhnqrTgPyPk3oSwHzvPy1oaf6bTI +Y/aDQjohFVvQZxF8joKhAE8JrzjKAn8yXmX8VlGW53XBXAb88Ggkr5raMZ24Rcc4 +pdkOc7sFfVImH/ASwkcPi2xX0adlz937lD7rkn5/Q9B9AwsHb1yQKJgWEeYWOQ8C +F0SzpZiwHz5qB+eg3wMT0ZnvPJKitshyjQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 4befbc272497e1b834182c5dd5e166fd506b6984 Mon Sep 17 00:00:00 2001 From: death Date: Sat, 31 Mar 2012 23:11:14 +0200 Subject: deltet dead hosts --- retiolum/hosts/armageddon421_de | 11 ----------- retiolum/hosts/chinaman | 10 ---------- retiolum/hosts/krebsbitch | 10 ---------- retiolum/hosts/krebsbob | 11 ----------- retiolum/hosts/krebsnode | 11 ----------- retiolum/hosts/pa_sharepoint | 7 ------- retiolum/hosts/temperator | 10 ---------- retiolum/hosts/urkrebs | 10 ---------- retiolum/hosts/zerg | 10 ---------- 9 files changed, 90 deletions(-) delete mode 100644 retiolum/hosts/armageddon421_de delete mode 100644 retiolum/hosts/chinaman delete mode 100644 retiolum/hosts/krebsbitch delete mode 100644 retiolum/hosts/krebsbob delete mode 100644 retiolum/hosts/krebsnode delete mode 100644 retiolum/hosts/pa_sharepoint delete mode 100644 retiolum/hosts/temperator delete mode 100644 retiolum/hosts/urkrebs delete mode 100644 retiolum/hosts/zerg (limited to 'retiolum') diff --git a/retiolum/hosts/armageddon421_de b/retiolum/hosts/armageddon421_de deleted file mode 100644 index 13a2c946..00000000 --- a/retiolum/hosts/armageddon421_de +++ /dev/null @@ -1,11 +0,0 @@ -Address = armageddon421.de -Port = 1655 -Subnet = 42.233.216.106/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAqBfXS402JOadodsFB4a/aX/eBkuQxPHjEPpW7QBueEPbCHBAyPnT -GzpC9tJSfkaUfI5pL+kE5vCXqVuLErlJtESENI0FvtfFGHm/KxRwX6QEAiZZT0d0 -C331udvRwqDrjY3HVMcQo7ppcaRHTGNldIATZVVLvm8V8zJ28L/FIioGysNYFuLb -8V5ZVTFpXwUfeJOAbmz0CHB/hiQliP0CR/Y7sZ0dX9/DAg13z2iZc2HA65N1AqZc -L6knsC7DnzjY48d5BhbZXqcCybecx3s4igLuDZjoyHOyAtbR1QueDF/CRVnYsqSs -YItynNjtN9TEEvCG1klvCV7hyM8t2ecpwQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/chinaman b/retiolum/hosts/chinaman deleted file mode 100644 index 22f64b02..00000000 --- a/retiolum/hosts/chinaman +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:5a1d:f491:9e47:c4cd:175f:bd87:6da5/128 -Subnet = 42.207.40.226/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAwQWG4shbMq2Y2s2GH05DSR9God0ppslCgXLpM8I+L+khpF8JL83z -KdevKDl0mA4iVnSgqWKVUDCK5IN29wQAlPDiNvBir98vxTeuckvdeTZat0rr0O7t -o4MBMfZ0yXBxruu2/TjCyAkE/VN3h7tfzBh9HUQyVFWjaEhh8v2kOmGLt1UT3hKr -KdFFtCvbIAeHa6axiQvX0kmVZY8n2XK/1pPHSuxkKWUvum1jMplIQ6NewjeTbaan -6hNFcMFwbB333Wan1EKP3D7N/oniGspoyLXdO4Q/AXmfwMJvHdLZri4uLFMdOB/e -n2jo/GTcm7kzUW/IibqyeBvJ6xuTaQXb7QIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/krebsbitch b/retiolum/hosts/krebsbitch deleted file mode 100644 index a776368a..00000000 --- a/retiolum/hosts/krebsbitch +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:0398:5d7c:06c6:9978:4383:154b:3564/128 -Subnet = 42.35.192.96/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAuSPMGAVr8vLstf/4KnkFreYPhZGxmpE0IWaPIi39vz7d5Y8aE07R -DslQNV51X6YZ0qwfu1axfgn8cd679N9+X6fVxCV22ICPq9Rv6tCU4K//b08mIgxv -75D7RdWjPa3XbJiayK3SN8HuvcSo2cDXuvpG3D0yM5Cpjwu+40UZCVtSM7bZMY4M -E3urXJfdPZMh5Ajst4B/s5PymaiiUadvRnbVXjWCbtWIySHgg+Rg4Ww/47Sml1MJ -0DFEYb3RIsAW3sBsbfs54cF4jgO8YT2Pd0kIq4xey+/S14E6F6qxWizGwC2ZSF/o -qSbE1GJ2HlwhCt+cIr0g6s9s6QtzaLE36wIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/krebsbob b/retiolum/hosts/krebsbob deleted file mode 100644 index cd01e5a4..00000000 --- a/retiolum/hosts/krebsbob +++ /dev/null @@ -1,11 +0,0 @@ -Address = krebsbob.no.de -Port = 1655 -Subnet = 42.195.17.113/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAwF9uuth4ffpvSVd8gre70Mu6kmEQdnjlBnNu/25IPEtZIRW/nVJW -dOMUcKdHOX8oqLhixoJ81xUmas+nPMbo6qyoPHDwMsQP4/ShvnNiTmmxHjAL3ac6 -zMSf7upnYCgY/4Btb4hIHGFEWDxkoT6PrSUCykx9TASLat8jvalOHAbbS9EjD4Fw -WXJvoJIRCggeMggkJbiWHdKozE4ra0EUVPaVO1FJLVsmiH7q7KuF/MQwly125Mo0 -Mg3XRhEMNe7mpiTznRxwA/w8h8DRPi8Qp1cfg9vgh5bKvPMDwTWhGVEKUlWDyiob -7LR/O3rM8qkOWI4nx5GhtxdaCt0V9tPebwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/krebsnode b/retiolum/hosts/krebsnode deleted file mode 100644 index 187fee86..00000000 --- a/retiolum/hosts/krebsnode +++ /dev/null @@ -1,11 +0,0 @@ -Address = krebs.no.de -Port = 1655 -Subnet = 42.18.77.65/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEA8V86UoV5Eu3qWyXvMSfNG/OLHu9rOREwf+aNSRlpf0zGuHtH8Hzl -AJrfDe7ucKnn4YYhscpZB9Ae/wmQN3JytOzL1o0yxxdtehP8HjLVUCMCvF7Sx2++ -3PdpNMw7iUo08bRH8+8yRuxxJCrL+PJCbvE1/Speu/7jGioT8q+TKSl7f/bD0cSg -3TmDRG1lHVm/Synbd/aGeuI9CewGs3WukDVC6mmpWT0Q5bCG2YwJRO2kHz3ppUEO -sOyDfEeNiV6Cs3QF3j9DqQGIVvWrO4BKJoqhQ661UId7vokYRf3gkLSYs2/mkoWR -gMgBzL5++u4majp3p05wXua3j07eQE9qJQIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/pa_sharepoint b/retiolum/hosts/pa_sharepoint deleted file mode 100644 index dd31362e..00000000 --- a/retiolum/hosts/pa_sharepoint +++ /dev/null @@ -1,7 +0,0 @@ -Address = pa-sharepoint.informatik.ba-stuttgart.de -Subnet = 42.80.54.58/32 ------BEGIN RSA PUBLIC KEY----- -MIGJAoGBAKSle+5vi8j+auGIC41PwFRPdzuyhP/paAEht+9mWpTYYC1meyPDwQR8 -EPNLwj1ccjsAvhubfaDmI3B13cBQx5q1BbTCK81Y5RS1tj384kvAabJAtKsz3aIg -1hWXjiDJUGNpQhKsD7IIg4lkkDcgOBAbdtXlynCQXdQL+YjLTavBAgMBAAE= ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/temperator b/retiolum/hosts/temperator deleted file mode 100644 index 25c54bf2..00000000 --- a/retiolum/hosts/temperator +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:0b56:87fb:b3ab:677f:1158:bfa0:b937/128 -Subnet = 42.93.117.146/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEArV5wUD4DqM0RoqL47aPb4EcK8Fi7s+PaFwSqVYibMvjeh/zbRUqa -GQzEWa9ZR9dIzc0YNQKLOSKsiJNpdEwsWT5kUIUQq/YpFAQjcb/vEFbfZwesG08U -bmkiqXBVaRDYgdGvnJsfkxVYFuTBKstZk5zdK4/uUSVV6oB3G1xP29Umpjn13Dc6 -28F4aYSQ6U8wJaGpZWXiQrmGtFwaM3gY7MCGq3L/5ec+qo7/zqC3BNYYbuFPycs5 -O3H/Gu1E060YsThhtC4NbChupf0llJcHa7wpPyE2f31YBAQZMo5NpmQqWWLuLqSk -sT1QtjqIsNcMBK9ogxGb6fcMmycOUSsEFwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/urkrebs b/retiolum/hosts/urkrebs deleted file mode 100644 index ecffaec4..00000000 --- a/retiolum/hosts/urkrebs +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:0c61:780c:bf22:7624:fca8:d4d7:a4fd/128 -Subnet = 42.171.152.235/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAl6vUmUL8w8r2gUTpUF8QWx0U3nzDPao2I7l0WU1NnGcR8DVug7YN -595guvDkRGcM4eYGizgVYVvDCmjTQRXRn57ucVud2bGE1NGtdomVs6wggpgzLiaf -m9BJwsigoCyMv+8ewGfc+D10TupulcIiZSp/RAewYlX0rhmgdsEGnCt+TWvXRsIa -kY1pvt4YeKjs2ctib3OmaPuNokK4ophxSpdZ5arjHCaiVMj2O6pPAQbU7WFY63Fw -UP64cAmtqBM+uMteT7bdG1jT3KZS6W7Dy8rIBd+pp+vB656A5PhrDcGEUMFSXqPD -BwIxhV7OAejSn4XjrZyd5eNtMOQKopIMQwIDAQAB ------END RSA PUBLIC KEY----- diff --git a/retiolum/hosts/zerg b/retiolum/hosts/zerg deleted file mode 100644 index 9e9b0a4e..00000000 --- a/retiolum/hosts/zerg +++ /dev/null @@ -1,10 +0,0 @@ -Subnet = 42:448b:2bdc:d090:9f0f:a957:01a7:7254/128 -Subnet = 42.20.21.115/32 ------BEGIN RSA PUBLIC KEY----- -MIIBCgKCAQEAxLkTKBXMgChxgPlMlLqqGRx/MSZos2dkXdCw7pzyO9HRwYi2Ax1j -frVG8Z6YQJAxGv4mOtSLEkSfgzgg0AgCb1o0/fniFabYgBVBMr7K5HvnoJz+ODP2 -49O7+m8t495ygOVY/qO6u4ezSbzDTqcPUjQxUHRo1Ik4/uDjvkPe+rbxC2ZTVW/Z -YnhSaWwH/GkzI9T8OCmAGetdrsXKY+h/ukVJB89qHXAs2fqWIUvujyfwN/mj5mx4 -BT28RJr2/Mx2ivb1Dq1t8iaxNx+I8q5/WVl0EfZBKkSHsXtqzg9xqwzMS37dF356 -0uq2uuysIDbFMXF3jYvFSZyxCmgXNzvN5QIDAQAB ------END RSA PUBLIC KEY----- -- cgit v1.2.3 From 13b8db89f49eb094405de67d097d41eefeea8000 Mon Sep 17 00:00:00 2001 From: momo Date: Sun, 1 Apr 2012 01:48:10 +0200 Subject: adding karthus --- retiolum/hosts/karthus | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/karthus (limited to 'retiolum') diff --git a/retiolum/hosts/karthus b/retiolum/hosts/karthus new file mode 100644 index 00000000..dfb94799 --- /dev/null +++ b/retiolum/hosts/karthus @@ -0,0 +1,11 @@ +Subnet = 42:42:42:42:23:23:23:23 +Subnet = 10.243.42.13 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAnkVbRU5o5sPcKpN70p1djpmAnEg0YcHY+KPdR7R8sxLaq4V6e0qq +1TeUk3e4Eua3f6rT0AQGhNMmr6e7F4CmYFtNMV3ZV2wiOs6FRUURE6HvZCtytDss +/zkqiHkLIS97PXXnwIFXbrJlW6prS9YGior703vCX+bmf0aLIHbqExOGNGzxk6FH +DXtYo3Qt++h9RV/AQfOruXyiui3dbVsiUVa4a/jVFQCIrYTZtDg2LQIAkkwQmQYw +4iXP3vohtjLy/ELNRbf56zqH7qJIVgIXLCEAQ5l1NTHSw902mT+F2xXuzpnGi7iT +QYtk5OSADlIz9hM9Syo4G7j/bRV0lJWiCwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 56c85ac5703410bc18143806af502abec11f4a04 Mon Sep 17 00:00:00 2001 From: death Date: Mon, 2 Apr 2012 16:23:23 +0200 Subject: added smove --- retiolum/hosts/smove | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 retiolum/hosts/smove (limited to 'retiolum') diff --git a/retiolum/hosts/smove b/retiolum/hosts/smove new file mode 100644 index 00000000..fc7e194f --- /dev/null +++ b/retiolum/hosts/smove @@ -0,0 +1,9 @@ +Subnet = 10.243.42.42 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAzFFj6yAy2qC4gVrUV5vN6PztulRggkyXIMr2oPmPLuB85uxJE9nI +9uvsQdbgcmmEM++moPM/ASCEXuu1ikUK1Gl+8C3rv2IxF/zhcrWEJV4e4EvHrBWP +Xt4hSPyFG3LYpaX1OAWL2zmCvGVDmflWp+YkbBRrkMMEyXg0gZMNx+E7yJiNVYFo +DZ7p4VSncWsAqk0I1varQpkl7BR6p7QcJlMO403Rh2oQT1bPXskkZsfAyXN8wJTP +ATiTm5vijXiRUao+h9L60oxQTcvi9hcbhg+FpB3HYx2Rq6lWR0SqDO2OiBTTJnFM +6qvN7Wfdmxim0mLAwaqccRLCWA06iN8b7wIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 0ba126d5d841d4f1d19774bd700148bcaa128376 Mon Sep 17 00:00:00 2001 From: momo Date: Wed, 11 Apr 2012 21:41:16 +0200 Subject: adding luminos --- retiolum/hosts/luminos | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 retiolum/hosts/luminos (limited to 'retiolum') diff --git a/retiolum/hosts/luminos b/retiolum/hosts/luminos new file mode 100644 index 00000000..fe04b33d --- /dev/null +++ b/retiolum/hosts/luminos @@ -0,0 +1,11 @@ +Subnet = 42:23:42:23:42:23:42:23 +Subnet = 10.243.42.129 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAuxgY9SfSCyCuTw2bPtC/He2/NZDYQOcGd8+5Bo6h1/h2pU+qKPQB +0digU617dG2NVMaT0qmzEz86e2avr0PQsyfhmHO8JNOTqwjyQzKcv3iA+B0jU7Gh +F/PaW+e+0O+a3LO27FCA0uuxEHyWaXqk53a3wKmjo4fuVy1QKOOoiaFaYLaaTgmm +8OJG+AKWR/ArihpopgAHFjiqB89xWVw5CgxHDwfzVcmI9SOAaEuTfL065XM4uoH/ +LnbtoyT8zN+He1AlaEJMUaWdo8SWfjBFyVrT1zRQ+0S47tlTCW8Neb0KKs+m9d0G +rAdv6+iFmQzpv76cgYQw2+AkqkUF8Y8xSwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From eceb02b3ef6a3f14345631191f92da224881347d Mon Sep 17 00:00:00 2001 From: lassulus Date: Sat, 14 Apr 2012 02:31:14 +0200 Subject: added host random --- retiolum/hosts/random | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/random (limited to 'retiolum') diff --git a/retiolum/hosts/random b/retiolum/hosts/random new file mode 100644 index 00000000..59a354e9 --- /dev/null +++ b/retiolum/hosts/random @@ -0,0 +1,10 @@ +Subnet = 10.243.0.134 +Subnet = 42:725b:abec:0922:09c6:b51e:1a33:b93a/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEApgs77ljzQp7I8/9KbqzGjoDdNAA3Bp6dKziIJnHLAIDAHD30yY+o +UHbRPhaCP9s2M4A39wTDjrakngF75M+0covz4WBIiuGdwZywgVnliRk/9dcnqdZm +OeCxeRJ0BY3Iy8oMieFaPJW1XgwKYi2p0eSpBeKasBct2xNQwyvh+r+xHBa6NK0P +vV6rK04OrJu04U/tqklTFMTHGmZfjx1vmuecuPWZlgT39788/5aD9uqg2ldMoenE +eamrPdU2Vh6qlZc8CyHVy5YZDykbXTauUL5OmW2Om4Qc05pinsNnDXfMTkSSmWpN +oj6nieBqbp/ExuZ79LC5XxvQcAMQtk7gUwIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From ff93336964b5c59bb2e7ddfb790884593d8276ba Mon Sep 17 00:00:00 2001 From: EUcancER Date: Fri, 1 Jun 2012 15:31:44 +0200 Subject: //retiolum: adv_graphgen send stats via statsd --- retiolum/scripts/adv_graphgen/all_the_graphs.sh | 10 +++++++++- retiolum/scripts/adv_graphgen/parse_tinc_stats.py | 12 ++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/all_the_graphs.sh b/retiolum/scripts/adv_graphgen/all_the_graphs.sh index 36b37f03..2a41df38 100755 --- a/retiolum/scripts/adv_graphgen/all_the_graphs.sh +++ b/retiolum/scripts/adv_graphgen/all_the_graphs.sh @@ -1,5 +1,13 @@ -#!/bin/sh +#!/bin/bash echo "`date` begin all graphs" >> /tmp/build_graph cd $(dirname $(readlink -f $0)) +PATH=$PATH:../../../util/bin/ +begin=`timer` (./anonytize.sh /srv/http/pub/graphs/retiolum/ && echo "`date` anonytize done" >> /tmp/build_graph)& (./sanitize.sh /srv/http/priv/graphs/retiolum/ && echo "`date` sanitize done" >> /tmp/build_graph)& +for job in `jobs -p` +do + echo $job + wait $job || echo "$job failed!" +done +statsc "graphs.buildtime:$(timer $begin)|ms" diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py index 54dcc4ab..c676ad20 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py @@ -2,6 +2,14 @@ # -*- coding: utf8 -*- from BackwardsReader import BackwardsReader import sys,json +try: + import statsd +except: + print >>sys.stderr,'!! no statsd installed, try `pip install statsd`' + timer = statsd.Timer("graph.detail") + timer.start() + gauge = statsd.Gauge('graph.detail') + supernodes= [ "kaah","supernode","euer","pa_sharepoint","oxberg" ] """ TODO: Refactoring needed to pull the edges out of the node structures again, it should be easier to handle both structures""" @@ -36,6 +44,8 @@ def write_stat_node(nodes): ''' num_conns = 0 num_nodes = len(nodes) + try: gauge.send('num_nodes',num_nodes) + except: pass for k,v in nodes.iteritems(): num_conns+= len(v['to']) node_text = " stats_node [label=\"Statistics\\l" @@ -183,3 +193,5 @@ try: except Exception,e: sys.stderr.write("Cannot dump graph: %s" % str(e)) write_digraph(nodes) +try: timer.stop("execution_time") +except: pass -- cgit v1.2.3 From d2f737473e3bbcb7592a6745820bccd333128459 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Sat, 2 Jun 2012 01:14:05 +0200 Subject: //retiolum adv_graphgen: now writing stats to graphite painload now provides convenient tools to enable graphite stats generation currently logged are: - overall build time of graphs - anon and detailed build times - current number of users in the darknet --- retiolum/scripts/adv_graphgen/all_the_graphs.sh | 3 +- retiolum/scripts/adv_graphgen/anonytize.sh | 2 +- retiolum/scripts/adv_graphgen/parse_tinc_anon.py | 17 ++++++++++++ retiolum/scripts/adv_graphgen/parse_tinc_stats.py | 34 ++++++++++++++++------- retiolum/scripts/adv_graphgen/sanitize.sh | 2 +- 5 files changed, 45 insertions(+), 13 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/all_the_graphs.sh b/retiolum/scripts/adv_graphgen/all_the_graphs.sh index 2a41df38..92c89cc9 100755 --- a/retiolum/scripts/adv_graphgen/all_the_graphs.sh +++ b/retiolum/scripts/adv_graphgen/all_the_graphs.sh @@ -2,6 +2,7 @@ echo "`date` begin all graphs" >> /tmp/build_graph cd $(dirname $(readlink -f $0)) PATH=$PATH:../../../util/bin/ +export LOG_FILE=/var/log/retiolum.log begin=`timer` (./anonytize.sh /srv/http/pub/graphs/retiolum/ && echo "`date` anonytize done" >> /tmp/build_graph)& (./sanitize.sh /srv/http/priv/graphs/retiolum/ && echo "`date` sanitize done" >> /tmp/build_graph)& @@ -10,4 +11,4 @@ do echo $job wait $job || echo "$job failed!" done -statsc "graphs.buildtime:$(timer $begin)|ms" +graphitec "retiolum.graph.buildtime" "$(timer $begin)" diff --git a/retiolum/scripts/adv_graphgen/anonytize.sh b/retiolum/scripts/adv_graphgen/anonytize.sh index 1ebfe972..d49793cb 100755 --- a/retiolum/scripts/adv_graphgen/anonytize.sh +++ b/retiolum/scripts/adv_graphgen/anonytize.sh @@ -5,7 +5,7 @@ GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3='neato -Goverlap=prism ' GRAPH_SETTER4=sfdp -LOG_FILE=/var/log/syslog +LOG_FILE=${LOG_FILE:-/var/log/syslog} TYPE=svg TYPE2=png OPENER=/bin/true diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_anon.py b/retiolum/scripts/adv_graphgen/parse_tinc_anon.py index 3b0383da..c603d398 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_anon.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_anon.py @@ -3,6 +3,17 @@ from BackwardsReader import BackwardsReader import sys,json #supernodes= [ "kaah","supernode","euer","pa_sharepoint","oxberg" ] +try: + import socket + from time import time + host = "localhost" + port = 2003 + g_path = "retiolum" + begin = time() + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((host,port)) +except Exception as e: + print >>sys.stderr, "Cannot connect to graphite: " + str(e) """ TODO: Refactoring needed to pull the edges out of the node structures again, it should be easier to handle both structures""" DUMP_FILE = "/krebs/db/availability" @@ -133,3 +144,9 @@ def decode_input(FILE): nodes = decode_input(sys.stdin) nodes = delete_unused_nodes(nodes) write_digraph(nodes) +try: + end = time() + msg = '%s.graph.anon_build_time %d %d\n' % (g_path,((end-begin)*1000),end) + s.send(msg) + s.close() +except Exception as e: print >>sys.stderr, e diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py index c676ad20..a255a918 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py @@ -3,12 +3,16 @@ from BackwardsReader import BackwardsReader import sys,json try: - import statsd -except: - print >>sys.stderr,'!! no statsd installed, try `pip install statsd`' - timer = statsd.Timer("graph.detail") - timer.start() - gauge = statsd.Gauge('graph.detail') + from time import time + import socket + host = "localhost" + port = 2003 + g_path = "retiolum" + begin = time() + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((host,port)) +except Exception as e: + print >>sys.stderr, "Cannot connect to graphite: " + str(e) supernodes= [ "kaah","supernode","euer","pa_sharepoint","oxberg" ] """ TODO: Refactoring needed to pull the edges out of the node structures again, @@ -44,8 +48,12 @@ def write_stat_node(nodes): ''' num_conns = 0 num_nodes = len(nodes) - try: gauge.send('num_nodes',num_nodes) - except: pass + try: + msg = '%s.num_nodes %d %d\n' %(g_path,num_nodes,begin) + s.send(msg) + #print >>sys.stderr, msg + except Exception as e: print sys.stderr,e + #except: pass for k,v in nodes.iteritems(): num_conns+= len(v['to']) node_text = " stats_node [label=\"Statistics\\l" @@ -193,5 +201,11 @@ try: except Exception,e: sys.stderr.write("Cannot dump graph: %s" % str(e)) write_digraph(nodes) -try: timer.stop("execution_time") -except: pass + +try: + end = time() + msg = '%s.graph.detail_build_time %d %d\n' % (g_path,((end-begin)*1000),end) + s.send(msg) + print >>sys.stderr,msg + s.close() +except Exception as e: print >>sys.stderr, e diff --git a/retiolum/scripts/adv_graphgen/sanitize.sh b/retiolum/scripts/adv_graphgen/sanitize.sh index 50f1659f..c46662f3 100755 --- a/retiolum/scripts/adv_graphgen/sanitize.sh +++ b/retiolum/scripts/adv_graphgen/sanitize.sh @@ -5,7 +5,7 @@ GRAPH_SETTER1=dot GRAPH_SETTER2=circo GRAPH_SETTER3='neato -Goverlap=prism ' GRAPH_SETTER4=sfdp -LOG_FILE=/var/log/syslog +LOG_FILE=${LOG_FILE:-/var/log/syslog} TYPE=svg TYPE2=png OPENER=/bin/true -- cgit v1.2.3 From c04b0047db2249317a905f7d95d2fcaef6a479cc Mon Sep 17 00:00:00 2001 From: EUcancER Date: Tue, 5 Jun 2012 12:05:13 +0200 Subject: //retiolum all_the_graphs: update to be non-intrusive --- retiolum/scripts/adv_graphgen/all_the_graphs.sh | 27 +++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/all_the_graphs.sh b/retiolum/scripts/adv_graphgen/all_the_graphs.sh index 92c89cc9..0499e9c7 100755 --- a/retiolum/scripts/adv_graphgen/all_the_graphs.sh +++ b/retiolum/scripts/adv_graphgen/all_the_graphs.sh @@ -1,14 +1,15 @@ #!/bin/bash -echo "`date` begin all graphs" >> /tmp/build_graph -cd $(dirname $(readlink -f $0)) -PATH=$PATH:../../../util/bin/ -export LOG_FILE=/var/log/retiolum.log -begin=`timer` -(./anonytize.sh /srv/http/pub/graphs/retiolum/ && echo "`date` anonytize done" >> /tmp/build_graph)& -(./sanitize.sh /srv/http/priv/graphs/retiolum/ && echo "`date` sanitize done" >> /tmp/build_graph)& -for job in `jobs -p` -do - echo $job - wait $job || echo "$job failed!" -done -graphitec "retiolum.graph.buildtime" "$(timer $begin)" +set -x + +( + 1>>/tmp/build_graph + echo "`date` begin all graphs" >> /tmp/build_graph + cd $(dirname $(readlink -f $0)) + PATH=$PATH:../../../util/bin/ + export LOG_FILE=/var/log/retiolum.log + begin=`timer` + (./anonytize.sh /srv/http/pub/graphs/retiolum/ && echo "`date` anonytize done" >> /tmp/build_graph)& + (./sanitize.sh /srv/http/priv/graphs/retiolum/ && echo "`date` sanitize done" >> /tmp/build_graph)& + wait + graphitec "retiolum.graph.buildtime" "$(timer $begin)" &>>/tmp/build_graph +)& -- cgit v1.2.3 From 6046373ce92a9c9856d828b37cda28af437e36be Mon Sep 17 00:00:00 2001 From: EUcancER Date: Wed, 6 Jun 2012 00:11:02 +0200 Subject: //retiolum: trying to fix all_the_graphs --- retiolum/scripts/adv_graphgen/all_the_graphs.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/all_the_graphs.sh b/retiolum/scripts/adv_graphgen/all_the_graphs.sh index 0499e9c7..1640a446 100755 --- a/retiolum/scripts/adv_graphgen/all_the_graphs.sh +++ b/retiolum/scripts/adv_graphgen/all_the_graphs.sh @@ -1,8 +1,6 @@ #!/bin/bash -set -x ( - 1>>/tmp/build_graph echo "`date` begin all graphs" >> /tmp/build_graph cd $(dirname $(readlink -f $0)) PATH=$PATH:../../../util/bin/ @@ -10,6 +8,7 @@ set -x begin=`timer` (./anonytize.sh /srv/http/pub/graphs/retiolum/ && echo "`date` anonytize done" >> /tmp/build_graph)& (./sanitize.sh /srv/http/priv/graphs/retiolum/ && echo "`date` sanitize done" >> /tmp/build_graph)& - wait - graphitec "retiolum.graph.buildtime" "$(timer $begin)" &>>/tmp/build_graph +# wait +# graphitec "retiolum.graph.buildtime" "$(timer $begin)" >> /tmp/build_graph + echo "`date` end all graphs" >> /tmp/build_graph )& -- cgit v1.2.3 From dd1ba866c0f93500e1d3e4876fc75955be9d976a Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 8 Jun 2012 20:32:39 +0200 Subject: //retiolum/hosts: add incept vhost --- retiolum/hosts/incept | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/incept (limited to 'retiolum') diff --git a/retiolum/hosts/incept b/retiolum/hosts/incept new file mode 100644 index 00000000..1687710b --- /dev/null +++ b/retiolum/hosts/incept @@ -0,0 +1,10 @@ +Subnet = 10.243.0.174 +Subnet = 42:a2fc:1c89:65c7:6e60:1f62:eaf9:e9b6/128 +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAvy4J8CewsXeFkFOLqDwiTN+3fF0yjmP5ZVtrLrPJn7Ux75elTdn3 +iLcJYTgaO1/dmw8fPD5DkNnb3wiadZiFGXpsTd1jD69mHcn/6RY/0Fcne9qDiqgp +vafpUD5UP7/7S+l5kkD6n7HVRblLXJIJk6Z8RCRN8OGyfjMM1IKeoR8kR1+85fpf +C28fnU3Nz3YJDazOaMD7aGiyGZDRyY+wRjbWtMXE/NH8ydN148ZpFaMvBjM7fl/B +q8XS5Rs9lFlW2jpex+W2DNq5t4QRMUDrLgD0gug0UiYCYw4IJg7OiI3g6vwjSDtq +hRxpQ4nq3avmTR/NWzZ97PP4eXTCIQhiQQIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From 589d40b33fa150d007a42d1af65b9f0c417ee7b2 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Sat, 9 Jun 2012 00:41:01 +0200 Subject: add incept public address v4/v6 --- retiolum/hosts/incept | 2 ++ 1 file changed, 2 insertions(+) (limited to 'retiolum') diff --git a/retiolum/hosts/incept b/retiolum/hosts/incept index 1687710b..3c740768 100644 --- a/retiolum/hosts/incept +++ b/retiolum/hosts/incept @@ -1,3 +1,5 @@ +Address = 77.95.224.63 +Address = 2a00:7b80:3008:3::fafc:241 Subnet = 10.243.0.174 Subnet = 42:a2fc:1c89:65c7:6e60:1f62:eaf9:e9b6/128 -----BEGIN RSA PUBLIC KEY----- -- cgit v1.2.3 From c691aa0f3842105a153153a021f62385787e34ed Mon Sep 17 00:00:00 2001 From: EUcancER Date: Fri, 22 Jun 2012 12:50:48 +0200 Subject: make graphite host variable, fix bug --- retiolum/scripts/adv_graphgen/all_the_graphs.sh | 3 ++- retiolum/scripts/adv_graphgen/parse_tinc_anon.py | 8 +++++--- retiolum/scripts/adv_graphgen/parse_tinc_stats.py | 16 +++++++++------- 3 files changed, 16 insertions(+), 11 deletions(-) (limited to 'retiolum') diff --git a/retiolum/scripts/adv_graphgen/all_the_graphs.sh b/retiolum/scripts/adv_graphgen/all_the_graphs.sh index 1640a446..5533c722 100755 --- a/retiolum/scripts/adv_graphgen/all_the_graphs.sh +++ b/retiolum/scripts/adv_graphgen/all_the_graphs.sh @@ -6,9 +6,10 @@ PATH=$PATH:../../../util/bin/ export LOG_FILE=/var/log/retiolum.log begin=`timer` + export GRAPHITE_HOST="no_omo" (./anonytize.sh /srv/http/pub/graphs/retiolum/ && echo "`date` anonytize done" >> /tmp/build_graph)& (./sanitize.sh /srv/http/priv/graphs/retiolum/ && echo "`date` sanitize done" >> /tmp/build_graph)& # wait -# graphitec "retiolum.graph.buildtime" "$(timer $begin)" >> /tmp/build_graph + graphitec "retiolum.graph.buildtime" "$(timer $begin)" >> /tmp/build_graph echo "`date` end all graphs" >> /tmp/build_graph )& diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_anon.py b/retiolum/scripts/adv_graphgen/parse_tinc_anon.py index c603d398..e0bea913 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_anon.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_anon.py @@ -6,11 +6,13 @@ import sys,json try: import socket from time import time - host = "localhost" + import os + host = os.environ.get("GRAPHITE_HOST","localhost") port = 2003 - g_path = "retiolum" + g_path = os.environ.get("GRAPHITE_PATH","retiolum") begin = time() s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sys.stderr.write("connecting to %s:%d"%(host,port)) s.connect((host,port)) except Exception as e: print >>sys.stderr, "Cannot connect to graphite: " + str(e) @@ -146,7 +148,7 @@ nodes = delete_unused_nodes(nodes) write_digraph(nodes) try: end = time() - msg = '%s.graph.anon_build_time %d %d\n' % (g_path,((end-begin)*1000),end) + msg = '%s.graph.anon_build_time %d %d\r\n' % (g_path,((end-begin)*1000),end) s.send(msg) s.close() except Exception as e: print >>sys.stderr, e diff --git a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py index a255a918..16f4f795 100755 --- a/retiolum/scripts/adv_graphgen/parse_tinc_stats.py +++ b/retiolum/scripts/adv_graphgen/parse_tinc_stats.py @@ -5,14 +5,16 @@ import sys,json try: from time import time import socket - host = "localhost" + import os + host = os.environ.get("GRAPHITE_HOST","localhost") port = 2003 - g_path = "retiolum" + g_path = os.environ.get("GRAPHITE_PATH","retiolum") begin = time() s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + sys.stderr.write("connecting to %s:%d"%(host,port)) s.connect((host,port)) except Exception as e: - print >>sys.stderr, "Cannot connect to graphite: " + str(e) + sys.stderr.write("Cannot connect to graphite: %s\n" % str(e)) supernodes= [ "kaah","supernode","euer","pa_sharepoint","oxberg" ] """ TODO: Refactoring needed to pull the edges out of the node structures again, @@ -49,7 +51,7 @@ def write_stat_node(nodes): num_conns = 0 num_nodes = len(nodes) try: - msg = '%s.num_nodes %d %d\n' %(g_path,num_nodes,begin) + msg = '%s.num_nodes %d %d\r\n' %(g_path,num_nodes,begin) s.send(msg) #print >>sys.stderr, msg except Exception as e: print sys.stderr,e @@ -204,8 +206,8 @@ write_digraph(nodes) try: end = time() - msg = '%s.graph.detail_build_time %d %d\n' % (g_path,((end-begin)*1000),end) + msg = '%s.graph.detail_build_time %d %d\r\n' % (g_path,((end-begin)*1000),end) s.send(msg) - print >>sys.stderr,msg + sys.stderr.write(msg) s.close() -except Exception as e: print >>sys.stderr, e +except Exception as e: sys.stderr.write( str(e) + "\n") -- cgit v1.2.3 From 7e5d2f686c11113f2d8723bf00b36fe6fe038d88 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Fri, 22 Jun 2012 12:59:24 +0200 Subject: fix ip of monitoring --- retiolum/hosts/monitoring | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/hosts/monitoring b/retiolum/hosts/monitoring index 8bc6dd16..e51c309d 100644 --- a/retiolum/hosts/monitoring +++ b/retiolum/hosts/monitoring @@ -1,5 +1,5 @@ Subnet = 42:82cb:f60c:6f27:611a:42f8:906c:2c70/128 -Subnet = 42.160.97.250/32 +Subnet = 10.243.97.250/32 -----BEGIN RSA PUBLIC KEY----- MIGJAoGBAMjS8WxgbfJKVGRIFD0Bv+odQ7THNWDIcr1p4riVbOUPxtce+abasYGl DOwaejcHP5bF11EAOOvdEtrivZReIZqYbMz5oWHLO6GCJn7nOCZVCW4LnUuNP3u8 -- cgit v1.2.3 From 8ef881f4cc499cb79fb427b0ce04c1c82d37125e Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 5 Jul 2012 00:24:12 +0200 Subject: //retiolum -v flag not supported by old or retarded systems (openwrt) --- retiolum/Makefile | 6 ++++-- retiolum/bin/update-retiolum-hosts | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'retiolum') diff --git a/retiolum/Makefile b/retiolum/Makefile index 668ee58e..a8ae0973 100644 --- a/retiolum/Makefile +++ b/retiolum/Makefile @@ -5,14 +5,13 @@ EXES := update_tinc_hosts fillxx update-retiolum-hosts all: update links links: - for x in $(EXES); do ln -vsnf ../retiolum/bin/$$x ../bin; done + for x in $(EXES); do ln -snf ../retiolum/bin/$$x ../bin; done install: upgrade ../punani/bin/punani install tinc python scripts/tinc_setup/install.sh sudo cp scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up - scripts/autostart/create-startup.sh upgrade: update if ! diff -u scripts/tinc_setup/tinc-up /etc/tinc/retiolum/tinc-up; then \ @@ -25,5 +24,8 @@ update: hosts bin/update_tinc_hosts restart sudo pkill -HUP tincd || :; +startup: + scripts/autostart/create-startup.sh + hosts: bin/update-retiolum-hosts || :; diff --git a/retiolum/bin/update-retiolum-hosts b/retiolum/bin/update-retiolum-hosts index 1fecfe15..2a379459 100755 --- a/retiolum/bin/update-retiolum-hosts +++ b/retiolum/bin/update-retiolum-hosts @@ -10,7 +10,7 @@ fi # cd //retiolum cd $(dirname $(readlink -f $0))/.. -mkdir -v -p /etc/tinc/retiolum/hosts +mkdir -p /etc/tinc/retiolum/hosts cp -v -r hosts/* /etc/tinc/retiolum/hosts pkill -HUP tincd pkill -ALRM tincd -- cgit v1.2.3 From 83bb287ea71617ce5bb1dd1d6b5a2daeaa953f86 Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 5 Jul 2012 00:33:04 +0200 Subject: //retiolum/update_tinc_hosts: grep -P --> egrep avoid using experimental -P flag for gnu grep to support openwrt --- retiolum/bin/update_tinc_hosts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/bin/update_tinc_hosts b/retiolum/bin/update_tinc_hosts index b3529a7f..7be30c2a 100755 --- a/retiolum/bin/update_tinc_hosts +++ b/retiolum/bin/update_tinc_hosts @@ -17,7 +17,7 @@ es='# END OF RETIOLUM' case "${*-I am made of stupid}" in (start|restart) - hosts | grep -P "^(10|42)" | $0 replace magic + hosts | egrep "^(10|42)" | $0 replace magic ;; (stop) $0 clear magic -- cgit v1.2.3 From 95fd5d4e4e2ccad72d2b0934e8f9acd35fbe33b2 Mon Sep 17 00:00:00 2001 From: EUcancER Date: Fri, 10 Aug 2012 13:48:09 +0200 Subject: add krebsplug --- retiolum/hosts/krebsplug | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 retiolum/hosts/krebsplug (limited to 'retiolum') diff --git a/retiolum/hosts/krebsplug b/retiolum/hosts/krebsplug new file mode 100644 index 00000000..ab9c966c --- /dev/null +++ b/retiolum/hosts/krebsplug @@ -0,0 +1,10 @@ +Subnet = 10.243.0.182 + +-----BEGIN RSA PUBLIC KEY----- +MIIBCgKCAQEAyd4FnOIEcUDQDudDOhU4wwKT+lqV4RJMfg9QgZC2O3xTGvzsFeRG +aSMIDMkPzhJ/ggIWAzC+IM2kBv+YCRhu4zOnzWIo5IaC8Me2TZ1JhZ0nZN1YzEGD +LmBsnngO5L1VnWLYSKRALa5Kv6wQHHz0T6PlsvBQ8SWDG3IKIe/gOFz7eh1Z+ss/ +5XaiYeLMmukEuuilOJZhfDiZPmYOeFI5w7YTM+8Iz/oZRyf8P57pjN21R3feoyTm +WusgHUuRLRqSUHdYu/E36EyZ9Oc0WPk5yLUhstkPaS1Y35xMEhZfQQpIruQxOst1 +fgiOQg/gKmizzgzdCbfAf13dknkWsqoc0wIDAQAB +-----END RSA PUBLIC KEY----- -- cgit v1.2.3 From eb8ea18d8923eec80f1ce6b7ce2d547a8fc35b2c Mon Sep 17 00:00:00 2001 From: makefu Date: Thu, 16 Aug 2012 18:34:09 +0200 Subject: update ytart --- retiolum/hosts/ytart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'retiolum') diff --git a/retiolum/hosts/ytart b/retiolum/hosts/ytart index 9df79635..09a55f65 100644 --- a/retiolum/hosts/ytart +++ b/retiolum/hosts/ytart @@ -1,4 +1,4 @@ -Subnet = 42.82.65.226/32 +Subnet = 10.243.65.226/32 -----BEGIN RSA PUBLIC KEY----- MIIBCgKCAQEA2yCCN8nAPmZNL75Jr+FtfP5jmyuqg7IpgfW03L3s8Gg7NB1eTQAg UFPh13cj4lZleZOl3Yus7yx4HxMO8tYCptqnRPyP+UXrxvL+kECS4J3rLzjH/eOM -- cgit v1.2.3