From 688d3a6bfb6b7c0c883c6392f249b17f6f3dd67b Mon Sep 17 00:00:00 2001
From: tv <tv@iiso>
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(-)

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 <tv@iiso>
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(-)

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 <miefda@miefda.de>
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

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 <miefda@miefda.de>
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

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 <lassulus@googlemail.com>
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

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 <lassulus@googlemail.com>
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(-)

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 <lassulus@googlemail.com>
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

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 <lassulus@googlemail.com>
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

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 <lassulus@googlemail.com>
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

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 <lassulus@googlemail.com>
Date: Mon, 27 Feb 2012 01:43:52 +0100
Subject: now with HUP signal

---
 retiolum/openwrt/updater | 1 +
 1 file changed, 1 insertion(+)

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 <lassulus@googlemail.com>
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

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 13c1c83b3b857fa7830b3d91d87af87fff686d42 Mon Sep 17 00:00:00 2001
From: hdznrrd <hadez@nrrd.de>
Date: Fri, 9 Mar 2012 08:53:41 +0100
Subject: add all the soma.fm streams!

---
 streams/stream.db | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/streams/stream.db b/streams/stream.db
index 6ca9a627..10684d23 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -1,5 +1,26 @@
-http://somafm.com/groovesalad.pls groove 
 http://deepmix.ru/deepmix128.pls deepmix
 http://streams.xenim.de/radiotux.ogg radiotux
 http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
 http://somafm.com/illstreet.pls illstreet
+http://somafm.com/sxfm.pls southbysoma
+http://somafm.com/indiepop.pls indypop
+http://somafm.com/poptron.pls poptron
+http://somafm.com/480min.pls 480min
+http://somafm.com/u80s.pls underground80s
+http://somafm.com/secretagent.pls secretagent
+http://somafm.com/suburbsofgoa.pls suburbsofgoa
+http://somafm.com/beatblender.pls beatblender
+http://somafm.com/missioncontrol.pls missioncontrol
+http://somafm.com/dronezone.pls dronezone
+http://somafm.com/cliqhop.pls cliqhop
+http://somafm.com/spacestation.pls spacestationsoma
+http://somafm.com/bootliquor.pls bootliquor
+http://somafm.com/covers.pls covers
+http://somafm.com/illstreet.pls illstreet
+http://somafm.com/tags.pls tagstrip
+http://somafm.com/groovesalad.pls groove 
+http://somafm.com/lush.pls lush
+http://somafm.com/digitalis.pls digitalis
+http://somafm.com/sonicuniverse.pls sonicuniverse
+http://somafm.com/doomed.pls doomed
+http://somafm.com/brfm.pls blackrockfm
\ No newline at end of file
-- 
cgit v1.2.3


From fe7570c86536b6ca84aad115bc516b5e4f9c3990 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Sat, 10 Mar 2012 01:01:22 +0100
Subject: refactor bootstrap file

---
 infest/bootstrap.sh | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/infest/bootstrap.sh b/infest/bootstrap.sh
index c434a4fe..3a560ffa 100644
--- a/infest/bootstrap.sh
+++ b/infest/bootstrap.sh
@@ -1,23 +1,27 @@
 #!/bin/sh
-set -x
+set -euf
+# Can be overwritten before install
+KREBSDIR=${KREBSDIR:-/krebs}
 [ "`id -u`" -eq "0" ] || { echo "you need to be root!"; exit 1;} || exit 1
 
-[ -e '/usr/bin/git' ] || \
-apt-get install -y git-core || \
-yum install git || \
-opkg install git || \
-pacman -Sy git || \
-{ echo "please install git!"; exit 1;} || exit 1
+command -v git || \
+    apt-get install -y git-core || \
+    yum install git || \
+    opkg install git || \
+    ipkg install git || \
+    pacman -Sy git || \
+    { echo "please install git manually!"; exit 1;} || exit 1
 
-[ -e '/krebs' ] || git clone git://github.com/krebscode/painload.git /krebs \
-|| { echo "cloning failed :(" ; exit 1; } || exit 1
+[ -e "$KREBSDIR" ] || git clone https://github.com/krebscode/painload.git "$KREBSDIR" \
+    || { echo "cloning failed :(" ; exit 1; } || exit 1
 
-cd /krebs || { echo "cannot change into /krebs folder:(" ; exit 1; } || exit 1
+cd $KREBSDIR || { echo "cannot change into $KREBSDIR folder:(" ; exit 1; } || exit 1
 
-#read -n1 -p "infest now? [yN]"
-
-#[[ $REPLY = [yY] ]] && make infest 
-#echo $REPLY
-echo "do 'make infest' in /krebs"
+echo "do 'make infest' in $KREBSDIR"
 echo "have a nice day"
 
+
+PATH=$PATH:$KREBSDIR/punani/bin
+
+# bootstrap the rest
+punani install make
-- 
cgit v1.2.3


From fe0b306dfd3ff4f23b5bf6a5920087d1ea3249d4 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Sat, 10 Mar 2012 22:30:45 +0100
Subject: installation in correct order

---
 infest/bootstrap.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/infest/bootstrap.sh b/infest/bootstrap.sh
index 3a560ffa..723e78f0 100644
--- a/infest/bootstrap.sh
+++ b/infest/bootstrap.sh
@@ -4,6 +4,8 @@ set -euf
 KREBSDIR=${KREBSDIR:-/krebs}
 [ "`id -u`" -eq "0" ] || { echo "you need to be root!"; exit 1;} || exit 1
 
+
+# brute force install git, krebs style
 command -v git || \
     apt-get install -y git-core || \
     yum install git || \
@@ -17,11 +19,13 @@ command -v git || \
 
 cd $KREBSDIR || { echo "cannot change into $KREBSDIR folder:(" ; exit 1; } || exit 1
 
-echo "do 'make infest' in $KREBSDIR"
-echo "have a nice day"
 
 
 PATH=$PATH:$KREBSDIR/punani/bin
 
-# bootstrap the rest
+# install the rest
 punani install make
+
+
+echo "do 'make infest' in $KREBSDIR"
+echo "have a nice day"
-- 
cgit v1.2.3


From d802ca802b6916e44297885bc3bb1fc06c84ed3c Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
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

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 <github@syntax-fehler.de>
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(-)

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 <github@syntax-fehler.de>
Date: Sat, 10 Mar 2012 22:51:36 +0100
Subject: fix broken punani call

---
 retiolum/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 <lassulus@googlemail.com>
Date: Sat, 10 Mar 2012 23:51:32 +0100
Subject: fixed filebitch

---
 retiolum/hosts/filebitch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 <github@syntax-fehler.de>
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

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 <root@euer.krebsco.de>
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

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 <root@euer.krebsco.de>
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

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 a082985e111ae776e44065fec52e5f3a3199e138 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 23 Mar 2012 22:08:28 +0100
Subject: soundboard: initial commit

---
 god/soundboard/README      |  5 +++++
 god/soundboard/config.json | 13 +++++++++++++
 god/soundboard/sound.py    | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 oncology/bin/krebshostup   |  2 --
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 god/soundboard/README
 create mode 100644 god/soundboard/config.json
 create mode 100644 god/soundboard/sound.py
 delete mode 100755 oncology/bin/krebshostup

diff --git a/god/soundboard/README b/god/soundboard/README
new file mode 100644
index 00000000..8fbb8947
--- /dev/null
+++ b/god/soundboard/README
@@ -0,0 +1,5 @@
+# Soundboard 
+The basic idea is to use a joystick or gamepad to trigger actions
+
+# config.json
+currently there is only one joystick supported, as well as one pad and buttons
diff --git a/god/soundboard/config.json b/god/soundboard/config.json
new file mode 100644
index 00000000..dbdeb5cb
--- /dev/null
+++ b/god/soundboard/config.json
@@ -0,0 +1,13 @@
+{
+  "direction" : {
+    "up" : "echo pushed up",
+    "down" : "echo pushed down",
+    "left" : "echo pushed left",
+    "right" : "echo pushed right"
+  },
+  "button" : {
+    "1" : "echo 'fuck yeah 1'",
+    "2" : "echo 'fuck jeah 2'",
+    "8" : "echo 'fuck jeah 8'"
+  }
+}
diff --git a/god/soundboard/sound.py b/god/soundboard/sound.py
new file mode 100644
index 00000000..f6564db0
--- /dev/null
+++ b/god/soundboard/sound.py
@@ -0,0 +1,46 @@
+import pygame
+import os
+from pygame import locals
+import json
+CFG_FILE = "config.json"
+cfg = json.load(open(CFG_FILE))
+
+pygame.init()
+pygame.joystick.init()
+try:
+    j = pygame.joystick.Joystick(0)
+    j.init()
+    print 'Enabled joystick: ' + j.get_name()
+except pygame.error:
+    print 'no joystick found.'
+
+
+while 1:
+    for e in pygame.event.get():
+        #print 'event : ' + str(e.type)
+        #print 'data  : ' + str(e.dict)
+        if e.type == pygame.locals.JOYAXISMOTION:
+            x, y = j.get_axis(0), j.get_axis(1)
+            if (x > 0):
+                direction = "right"
+            elif(x < 0):
+                direction = "left"
+            if (y > 0):
+                direction = "up"
+            elif(y < 0):
+                direction = "down"
+            if (y == x == 0):
+                pass
+            else:
+                try:
+                    os.system(cfg["direction"][direction])
+                except Exception as balls:
+                    print "direction not defined?", balls
+
+        elif e.type == pygame.locals.JOYBUTTONDOWN:
+            try:
+                os.system(cfg["button"][str(e.button)])
+            except Exception as balls:
+                print "button not defined: ", balls
+        #elif e.type == pygame.locals.JOYBUTTONUP:
+        #    print 'button up', e.joy, e.button
diff --git a/oncology/bin/krebshostup b/oncology/bin/krebshostup
deleted file mode 100755
index 65ccae12..00000000
--- a/oncology/bin/krebshostup
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-nmap -sP 42.0.0.0/8 -T5| grep "Host is up" | wc -l
-- 
cgit v1.2.3


From ecf3778511837456c005577acd1b4195f50ea101 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Wed, 28 Mar 2012 11:56:34 +0200
Subject: add notify_irc

---
 Monitoring/plugins/notify_irc | 87 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100755 Monitoring/plugins/notify_irc

diff --git a/Monitoring/plugins/notify_irc b/Monitoring/plugins/notify_irc
new file mode 100755
index 00000000..e1de0866
--- /dev/null
+++ b/Monitoring/plugins/notify_irc
@@ -0,0 +1,87 @@
+#! /usr/bin/env python
+#
+# Example program using irclib.py.
+#
+# This program is free without restrictions; do anything you like with
+# it.
+#
+# Joel Rosdahl <joel@rosdahl.net>
+
+import irclib
+import sys
+#irclib.DEBUG= True
+class IRCCat(irclib.SimpleIRCClient):
+    def __init__(self, target,msg=""):
+        irclib.SimpleIRCClient.__init__(self)
+        self.target = target
+        self.msg = msg
+
+    def on_welcome(self, connection, event):
+        if irclib.is_channel(self.target):
+            connection.join(self.target)
+        else:
+            self.send_it()
+
+    def on_join(self, connection, event):
+        self.send_it()
+
+    def on_disconnect(self, connection, event):
+        sys.exit(0)
+
+    def send_it(self):
+        if self.msg:
+            print "writing given argv privmsg",self.msg
+            self.connection.privmsg(self.target, self.msg)
+        else:
+            print "writing stdin privmsg:"
+            while 1:
+                line = sys.stdin.readline()
+                if not line:
+                    break
+                print line
+                self.connection.privmsg(self.target, line)
+        self.connection.quit("Using irclib.py")
+def findGreatNick(prefix='shinken'):
+    import random
+    import re
+    dic="/usr/share/dict/danish"
+    found=False
+    while not found:
+      w = random.choice(list(open(dic)))
+      found = re.match(r"^[a-zA-Z_-]+$",w)
+    return  prefix +"|"+w.strip()
+
+def main():
+    if len(sys.argv) < 3:
+        print "Usage: notify_irc <server[:port]> <target> [message]"
+        print "\ntarget is a nickname or a channel."
+        sys.exit(1)
+
+    s = sys.argv[1].split(":", 1)
+    server = s[0]
+    if len(s) == 2:
+        try:
+            port = int(s[1])
+        except ValueError:
+            print "Error: Erroneous port."
+            sys.exit(1)
+    else:
+        port = 6667
+    import random
+    nickname = findGreatNick()
+    print nickname
+    target = sys.argv[2]
+    msg = ""
+    if len(sys.argv) == 4:
+      msg = sys.argv[3]
+    c = IRCCat(target,msg)
+    try:
+        print "trying to connect to ",server,port,nickname
+        c.connect(server, port, nickname )
+    except irclib.ServerConnectionError, x:
+        print x
+        sys.exit(1)
+    c.start()
+
+if __name__ == "__main__":
+    main()
-- 
cgit v1.2.3


From 170da4aaf1ba4b961b6c33c5ca0c8e8613321fee Mon Sep 17 00:00:00 2001
From: death <death@uriel.(none)>
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

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 bab3c10e3bc719b669869196c8f1a4d6073f3378 Mon Sep 17 00:00:00 2001
From: death <death@uriel.(none)>
Date: Sat, 31 Mar 2012 22:02:56 +0200
Subject: new version

---
 util/bin/naturalvoices2.sh | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100755 util/bin/naturalvoices2.sh

diff --git a/util/bin/naturalvoices2.sh b/util/bin/naturalvoices2.sh
new file mode 100755
index 00000000..a01ff621
--- /dev/null
+++ b/util/bin/naturalvoices2.sh
@@ -0,0 +1,3 @@
+text=$(echo $* | sed 's/ /+/g')
+mplayer2 http://192.20.225.36$( curl -Ss -A "Mozilla" -d "voice=klara" -d "txt=$text" -d "speakButton=SPEAK" http://192.20.225.36/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g')
+
-- 
cgit v1.2.3


From 61cc151c54098a424f6f0ecfa33b065efeb292a0 Mon Sep 17 00:00:00 2001
From: death <death@uriel.(none)>
Date: Sat, 31 Mar 2012 22:03:31 +0200
Subject: fixed

---
 util/bin/naturalvoices2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/bin/naturalvoices2.sh b/util/bin/naturalvoices2.sh
index a01ff621..27c4f27e 100755
--- a/util/bin/naturalvoices2.sh
+++ b/util/bin/naturalvoices2.sh
@@ -1,3 +1,3 @@
 text=$(echo $* | sed 's/ /+/g')
-mplayer2 http://192.20.225.36$( curl -Ss -A "Mozilla" -d "voice=klara" -d "txt=$text" -d "speakButton=SPEAK" http://192.20.225.36/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g')
+mplayer http://192.20.225.36$( curl -Ss -A "Mozilla" -d "voice=klara" -d "txt=$text" -d "speakButton=SPEAK" http://192.20.225.36/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g')
 
-- 
cgit v1.2.3


From 4befbc272497e1b834182c5dd5e166fd506b6984 Mon Sep 17 00:00:00 2001
From: death <death@uriel.(none)>
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

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 <m@hackathon.de>
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

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 96858e51f9640bea09857c6189982944bc53a0bc Mon Sep 17 00:00:00 2001
From: momo <m@hackathon.de>
Date: Mon, 2 Apr 2012 16:12:01 +0200
Subject: changing espeak into naturalvoices

---
 god/overlord/index | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/god/overlord/index b/god/overlord/index
index ef0aebb3..d9cae0c2 100755
--- a/god/overlord/index
+++ b/god/overlord/index
@@ -17,7 +17,7 @@ streams/streams stop
 
 amixer -q -c 0 -D hw:0 sset Front $max%
 mplayer god/overlord/announce.mp3 >/dev/null
-espeak -v de -s 120 -a 900 "$*"
+../../util/bin/naturalvoices2.sh "$*"
 
 # fade-in streams
 streams/streams start
-- 
cgit v1.2.3


From 56c85ac5703410bc18143806af502abec11f4a04 Mon Sep 17 00:00:00 2001
From: death <death@uriel.(none)>
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

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 66a89c3311e126b0280369700ee6549683cfee99 Mon Sep 17 00:00:00 2001
From: momo <m@hackathon.de>
Date: Wed, 11 Apr 2012 13:40:33 +0200
Subject: //util/bin/naturalvoices2.sh: adding variables easy configurability

---
 util/bin/naturalvoices2.sh | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/util/bin/naturalvoices2.sh b/util/bin/naturalvoices2.sh
index 27c4f27e..4d8015aa 100755
--- a/util/bin/naturalvoices2.sh
+++ b/util/bin/naturalvoices2.sh
@@ -1,3 +1,6 @@
 text=$(echo $* | sed 's/ /+/g')
-mplayer http://192.20.225.36$( curl -Ss -A "Mozilla" -d "voice=klara" -d "txt=$text" -d "speakButton=SPEAK" http://192.20.225.36/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g')
+voice="klara"
+base_url="http://192.20.225.36"
+
+mplayer $base_url$( curl -Ss -A "Mozilla" -d "voice=$voice" -d "txt=$text" -d "speakButton=SPEAK" $base_url/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g')
 
-- 
cgit v1.2.3


From 0ba126d5d841d4f1d19774bd700148bcaa128376 Mon Sep 17 00:00:00 2001
From: momo <m@hackathon.de>
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

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 91acb0c20a8c4a7687c397a8713029b2ca325b64 Mon Sep 17 00:00:00 2001
From: momo <m@hackathon.de>
Date: Fri, 13 Apr 2012 19:12:37 +0200
Subject: adding demoscene stream

---
 streams/stream.db | 1 +
 1 file changed, 1 insertion(+)

diff --git a/streams/stream.db b/streams/stream.db
index cdf1c329..2e873843 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -32,3 +32,4 @@ http://somafm.com/digitalis.pls digitalis
 http://somafm.com/sonicuniverse.pls sonicuniverse
 http://somafm.com/doomed.pls doomed
 http://somafm.com/brfm.pls blackrockfm
+http://de.scenemusic.net/necta192.mp3 demoscene
-- 
cgit v1.2.3


From 8fbe16567c698415d1be1c0d75445ccb7369a497 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 13 Apr 2012 23:56:19 +0200
Subject: add drop-in replacement for streams daemon

---
 streams/streams.py | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)
 create mode 100644 streams/streams.py

diff --git a/streams/streams.py b/streams/streams.py
new file mode 100644
index 00000000..65669b2d
--- /dev/null
+++ b/streams/streams.py
@@ -0,0 +1,116 @@
+#!/usr/bin/python
+import os
+import sys
+from subprocess import Popen, PIPE
+
+os.chdir(os.path.dirname(os.path.realpath(sys.argv[0])))
+pidfile = "/tmp/krebs.stream.pid"
+url_file = os.environ.get("STREAM_DB", "stream.db")
+urls = []
+#urls = [ url,f for (url,f) in open(url_file).readline() ]
+for line in open(url_file):
+    urls.append(line.split())
+#print urls
+mybin = sys.argv[0]
+cmd = sys.argv[1] if len(sys.argv) > 1 else "you-are-made-of-stupid"
+stream = sys.argv[2] if len(sys.argv) == 3 else "groove"
+
+
+def check_pid(pid):
+    """ Check For the existence of a unix pid. """
+    try:
+        os.kill(pid, 0)
+    except OSError:
+        return False
+    else:
+        return True
+
+
+def urlForStream(stream):
+    for url, s in urls:
+        if s == stream:
+            return url
+
+
+def start(stream):
+    ret = running()
+    if ret:
+        print "!! Stream `%s` already running with pid `%s` !" % \
+                (ret[1], ret[0])
+    else:
+        pipe_silent = open('/dev/null', 'w')
+        url = urlForStream(stream)
+        mpl = Popen(["mplayer", url],
+                 stdout=pipe_silent, stderr=pipe_silent).pid
+        print >> open(pidfile, "w+"), "%d %s" % (mpl, stream)
+
+
+def stop():
+    ret = running()
+    if not ret:
+        print "!! No Stream running!"
+    else:
+        pid, name = ret
+        print "** Killing `%s` with pid %s" % (name, pid)
+        os.kill(int(pid), 15)
+        #if check_pid(int(pid)):
+        #    print "!! trying harder to kill process"
+        #    os.kill(int(pid), 9)
+        os.remove(pidfile)
+
+
+def running():
+    try:
+        pid, currstream = open(pidfile).read().split()
+        if check_pid(int(pid)):
+            return (pid, currstream)
+        else:
+            print "!! removing stale pidfile"
+            os.remove(pidfile)
+            raise Exception("Pidfile stale")
+    except Exception as e:
+        return ()
+
+
+def slist():
+    for url, name in urls:
+        print "%s : %s" % (name, url)
+
+
+def shorthelp():
+    print "start|stop|restart|status|list [audio stream]"
+
+
+def longhelp():
+    print "Usage: %s" % mybin,
+    shorthelp
+    print """ get all available streams with '/%(fil)s list'
+    Examples:
+    %(fil)s list
+    %(fil)s start groove
+    %(fil)s switch deepmix
+    %(fil)s status
+    %(fil)s stop""" % {'fil': mybin}
+
+if cmd == "start":
+    start(stream)
+elif cmd == "stop":
+    stop()
+elif cmd == "switch" or cmd == "restart":
+    stop()
+    start(stream)
+elif cmd == "status":
+    ret = running()
+    if not ret:
+        print "** no stream running"  # , e
+    else:
+        print "%s is running(%s)" % (ret[1], urlForStream(ret[1]))
+elif cmd == "list":
+    slist()
+elif cmd == "--help":
+    longhelp()
+elif cmd == "-h":
+    shorthelp()
+else:
+    print "unknown command `%s`" % cmd
+    print "try `%s` --help" % os.path.basename(mybin)
-- 
cgit v1.2.3


From eceb02b3ef6a3f14345631191f92da224881347d Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@googlemail.com>
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

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 3741d76a38dc4b412780eb2a4ad79467a01f884b Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 17 Apr 2012 23:30:41 +0200
Subject: add clean arguments to bot

---
 Reaktor/IRC/asybot.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Reaktor/IRC/asybot.py b/Reaktor/IRC/asybot.py
index 657cee40..17f9cb3a 100755
--- a/Reaktor/IRC/asybot.py
+++ b/Reaktor/IRC/asybot.py
@@ -12,6 +12,8 @@ from asyncore import loop
 from socket import AF_INET, SOCK_STREAM
 from signal import SIGALRM, signal, alarm
 from datetime import datetime as date, timedelta
+import shlex
+from time import sleep
 from sys import exit
 from re import split, search
 
@@ -107,6 +109,7 @@ class asybot(asychat):
     def PRIVMSG(text):
       msg = 'PRIVMSG %s :%s' % (','.join(params), text)
       self.push(msg)
+      sleep(2)
 
     def ME(text):
       PRIVMSG('
ACTION ' + text + '
')
@@ -133,11 +136,12 @@ class asybot(asychat):
       if is_executable(command):
 
         env = {}
+        args = []
         if _argument != None:
           env['argument'] = _argument
-
+          args = shlex.split(_argument)
         try:
-          p = popen([command], stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
+          p = popen([command] + args, stdin=PIPE, stdout=PIPE, stderr=PIPE, env=env)
         except OSError, error:
           ME('brain damaged')
           log.error('OSError@%s: %s' % (command, error))
@@ -181,8 +185,12 @@ if __name__ == "__main__":
 
   lol = logging.DEBUG if env.get('debug',False) else logging.INFO
   logging.basicConfig(level=lol)
-  name = getconf1('Name', '/etc/tinc/retiolum/tinc.conf')
-  hostname = '%s.retiolum' % name
+  try: 
+    name = getconf1('Name', '/etc/tinc/retiolum/tinc.conf')
+    hostname = '%s.retiolum' % name
+  except:
+    name = socket.gethostname()
+    hostname = name
   nick = str(env.get('nick', name))
   host = str(env.get('host', 'supernode'))
   port = int(env.get('port', 6667))
-- 
cgit v1.2.3


From 5c39a037807847ce5a8ec8bae6a1914a0445b7ec Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 17 Apr 2012 23:43:01 +0200
Subject: add debian autostart

---
 Reaktor/autostart/reaktor        |   2 +
 Reaktor/autostart/reaktor-debian | 102 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)
 create mode 100644 Reaktor/autostart/reaktor
 create mode 100755 Reaktor/autostart/reaktor-debian

diff --git a/Reaktor/autostart/reaktor b/Reaktor/autostart/reaktor
new file mode 100644
index 00000000..a4f3f8e1
--- /dev/null
+++ b/Reaktor/autostart/reaktor
@@ -0,0 +1,2 @@
+export target="#krebsco"
+export host="irc.freenode.com"
diff --git a/Reaktor/autostart/reaktor-debian b/Reaktor/autostart/reaktor-debian
new file mode 100755
index 00000000..61644788
--- /dev/null
+++ b/Reaktor/autostart/reaktor-debian
@@ -0,0 +1,102 @@
+#!/bin/sh
+# uses template from /etc/init.d/skeleton
+### BEGIN INIT INFO
+# Provides:          reaktor
+# Required-Start:    
+# Required-Stop:     
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: reaktor
+# Description:       starts reaktor daemon
+#                    
+### END INIT INFO
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+NAME=reaktor
+REAKTOR_USER=reaktor
+DESC="$NAME daemon"
+DAEMON=/usr/bin/python
+DAEMON_DIR="/krebs/Reaktor/IRC/"
+DAEMON_ARGS="${DAEMON_DIR}/asybot.py"
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+[ -x "$DAEMON" ] || exit 0
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+. /lib/init/vars.sh
+. /lib/lsb/init-functions
+
+do_start()
+{
+  #   0 if daemon has been started
+  #   1 if daemon was already running
+  #   2 if daemon could not be started
+  start-stop-daemon -b -d $DAEMON_DIR -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+          || return 1
+  start-stop-daemon -b -d $DAEMON_DIR -c $USER--start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
+      $DAEMON_ARGS \
+      || return 2
+}
+
+do_stop()
+{
+  #   0 if daemon has been stopped
+  #   1 if daemon was already stopped
+  #   2 if daemon could not be stopped
+  start-stop-daemon --stop --retry=TERM/30/KILL/5 --pidfile $PIDFILE
+  RETVAL="$?"
+  [ "$RETVAL" = 2 ] && return 2
+  rm -f $PIDFILE
+  return "$RETVAL"
+}
+
+do_reload() {
+  start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE
+  return 0
+}
+
+case "$1" in
+  start)
+  [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+  do_start
+  case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+  esac
+  ;;
+  stop)
+  [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+  do_stop
+  case "$?" in
+      0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+      2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+  esac
+  ;;
+  status)
+       status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
+       ;;
+  restart|force-reload)
+  log_daemon_msg "Restarting $DESC" "$NAME"
+  do_stop
+  case "$?" in
+    0|1)
+      do_start
+      case "$?" in
+          0) log_end_msg 0 ;;
+          1) log_end_msg 1 ;;
+          *) log_end_msg 1 ;;
+      esac
+      ;;
+    *)
+      # Failed to stop
+      log_end_msg 1
+      ;;
+  esac
+  ;;
+  *)
+  echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
+  exit 3
+  ;;
+esac
+
+:
-- 
cgit v1.2.3


From e9ec9f26b1d88e0bb2e219d8b5240bc0560dda67 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Tue, 17 Apr 2012 23:47:19 +0200
Subject: fix user management

---
 Reaktor/autostart/reaktor-debian | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Reaktor/autostart/reaktor-debian b/Reaktor/autostart/reaktor-debian
index 61644788..323449f8 100755
--- a/Reaktor/autostart/reaktor-debian
+++ b/Reaktor/autostart/reaktor-debian
@@ -13,7 +13,7 @@
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 NAME=reaktor
-REAKTOR_USER=reaktor
+USER=reaktor
 DESC="$NAME daemon"
 DAEMON=/usr/bin/python
 DAEMON_DIR="/krebs/Reaktor/IRC/"
@@ -33,7 +33,7 @@ do_start()
   #   2 if daemon could not be started
   start-stop-daemon -b -d $DAEMON_DIR -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
           || return 1
-  start-stop-daemon -b -d $DAEMON_DIR -c $USER--start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
+  start-stop-daemon -b -d $DAEMON_DIR -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
       $DAEMON_ARGS \
       || return 2
 }
-- 
cgit v1.2.3


From dfbd4b30b4239e8c276a076fa0bb9313f846dc04 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Tue, 17 Apr 2012 23:53:04 +0200
Subject: fix directory

---
 Reaktor/autostart/reaktor-debian | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Reaktor/autostart/reaktor-debian b/Reaktor/autostart/reaktor-debian
index 323449f8..a94384f4 100755
--- a/Reaktor/autostart/reaktor-debian
+++ b/Reaktor/autostart/reaktor-debian
@@ -31,9 +31,9 @@ do_start()
   #   0 if daemon has been started
   #   1 if daemon was already running
   #   2 if daemon could not be started
-  start-stop-daemon -b -d $DAEMON_DIR -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+  start-stop-daemon -b -d $DAEMON_DIR/.. -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
           || return 1
-  start-stop-daemon -b -d $DAEMON_DIR -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
+  start-stop-daemon -b -d $DAEMON_DIR/.. -c $USER --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON -- \
       $DAEMON_ARGS \
       || return 2
 }
-- 
cgit v1.2.3


From 8954275f37e3392adc4a85a2c6c18683fb149f10 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Tue, 17 Apr 2012 23:56:37 +0200
Subject: update makefile

---
 Reaktor/Makefile | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 Reaktor/Makefile

diff --git a/Reaktor/Makefile b/Reaktor/Makefile
new file mode 100644
index 00000000..2b121435
--- /dev/null
+++ b/Reaktor/Makefile
@@ -0,0 +1,4 @@
+debian-autostart:
+	cp autostart/reaktor-debian /etc/init.d/reaktor
+	cp autostart/reaktor /etc/default/
+	update-rc.d reaktor defaults
-- 
cgit v1.2.3


From 14eea1de9f193d8e31e8381ea12d34703d6d5ad3 Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Wed, 18 Apr 2012 11:16:21 +0200
Subject: Reaktor: add revip command

---
 Reaktor/commands/revip | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100755 Reaktor/commands/revip

diff --git a/Reaktor/commands/revip b/Reaktor/commands/revip
new file mode 100755
index 00000000..1d20037d
--- /dev/null
+++ b/Reaktor/commands/revip
@@ -0,0 +1,46 @@
+#!/usr/bin/python
+# fork from darkb0t v0.4
+# modularized and extended 
+import sys
+import os
+import json
+import socket
+import httplib
+try:
+  target = sys.argv[1]
+except:
+  print "Usage: %s [target]" % sys.argv[0]
+  exit(0)
+
+print "Reverse IP Search"
+print "Target: ",target
+try:
+  hostname,aliases,ip = socket.gethostbyaddr(target)
+except:
+  print "Cannot resolve `%s`!" % target
+  exit (1)
+print "IP: ",ip[0]
+sites = {target : "", hostname : ""} # make entries unique
+for a in aliases:
+  sites[a] = ""
+offset = 0
+appid = os.environ.get("BING_APPID",'7A0B8DA3E913BE5ECB4AF11C7BC398B43000DC1C')
+while offset < 50:
+  url ="/json.aspx?AppId=%s&Query=ip:%s&Sources=Web+RelatedSearch+News+Image+Video&Version=2.2&Market=en-us&Web.Count=50&Web.Offset=%s&Web.Options=DisableQueryAlterations" % (appid,  ip,  offset)
+  conn = httplib.HTTPConnection("api.bing.net")
+  conn.request("GET", url)
+  res = conn.getresponse()
+  doc = json.load(res)
+  try:
+    results = doc["SearchResponse"]["Web"]["Results"]
+    conn.close()
+    for res in results:
+      sites[res['DisplayUrl']] = ""
+    offset += 50
+  except:
+    break
+print "Total: ", len(sites), " dns name(s)\n"
+num = 1
+for s in sites:
+  print "["+str(num)+"/"+str(len(sites))+"] : "+s
+  num += 1
-- 
cgit v1.2.3


From 2a739377f53d7e7f9000683eff00ed40f56b14aa Mon Sep 17 00:00:00 2001
From: EUcancER <root@euer.krebsco.de>
Date: Wed, 18 Apr 2012 11:28:20 +0200
Subject: fix url parser

---
 Reaktor/commands/revip | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Reaktor/commands/revip b/Reaktor/commands/revip
index 1d20037d..b4920f52 100755
--- a/Reaktor/commands/revip
+++ b/Reaktor/commands/revip
@@ -6,6 +6,7 @@ import os
 import json
 import socket
 import httplib
+from urlparse import urlparse
 try:
   target = sys.argv[1]
 except:
@@ -25,7 +26,7 @@ for a in aliases:
   sites[a] = ""
 offset = 0
 appid = os.environ.get("BING_APPID",'7A0B8DA3E913BE5ECB4AF11C7BC398B43000DC1C')
-while offset < 50:
+while offset < 300:
   url ="/json.aspx?AppId=%s&Query=ip:%s&Sources=Web+RelatedSearch+News+Image+Video&Version=2.2&Market=en-us&Web.Count=50&Web.Offset=%s&Web.Options=DisableQueryAlterations" % (appid,  ip,  offset)
   conn = httplib.HTTPConnection("api.bing.net")
   conn.request("GET", url)
@@ -35,7 +36,7 @@ while offset < 50:
     results = doc["SearchResponse"]["Web"]["Results"]
     conn.close()
     for res in results:
-      sites[res['DisplayUrl']] = ""
+      sites[urlparse(res['Url'])[1]] = ""
     offset += 50
   except:
     break
-- 
cgit v1.2.3


From 9b6cf277da29f7d36d7262a8c3dea2f7bab017fc Mon Sep 17 00:00:00 2001
From: