From 16216df65630bde2e292323b5d7e8171171d0216 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Aug 2011 11:58:09 +0200 Subject: news: add retiolum --- cholerab/news/Candidate | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/cholerab/news/Candidate b/cholerab/news/Candidate index 8307cbee..cd75c20d 100644 --- a/cholerab/news/Candidate +++ b/cholerab/news/Candidate @@ -16,4 +16,20 @@ verfuegung gestellt hat. [0.1]: https://github.com/krebscode/painload/tree/master/god -## 1. more to come +## 1. Tinc Retiolum updates +Das retiolum Darknet ueber tinc als vermaschtes VPN ist ein integraler +Bestandteil der Krebs Infrastruktur. Umso wichtiger ist es, dass die +installation ueberall imer genau das richtige macht. + +KM Pfleidi hat sich gestern (26.08.2011) Retiolum angenommen um es +sauber auf OSX (und ggf. weiteren Unixartigen OSen) zum laufen zu +bringen. + +In diesem Kontext sind unter anderem Skript fuer das erraten des richtigen +Tinc-Konfigurationsordners [1.1] entstanden. Eine aehnliche funktionalitaet +kann nun fuer verschiedenste weitere module, welche Plattformunabhaengigkeit +gewaehrleisten sollen verwendet werden. + +[1.1] : https://github.com/krebscode/painload/tree/master/retiolum/bin/get-tinc-dir + +## 2. KNUT - Die Krebs Notification Utility Toolchain -- cgit v1.2.3 From 0d453e2afa46e456a723dc89cc7c00599e845caf Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 26 Aug 2011 12:07:19 +0200 Subject: news: add einfuerung --- cholerab/news/Candidate | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/cholerab/news/Candidate b/cholerab/news/Candidate index cd75c20d..8abc0b00 100644 --- a/cholerab/news/Candidate +++ b/cholerab/news/Candidate @@ -1,4 +1,11 @@ # Krebs News Issue #1 (2011-08-24) +## Ante Scriptum +Wer noch kein Krebs hat kann es ganz einfach mit git aus github[-1.1] +auschecken. + +Alle Pfade in den Krebs News beginnend mit `//` bezeichnen das root +verzeichnis des ausgecheckten krebs ordners ( optimaler weise in `/krebs`). + ## 0. godmode im shack Der Urkrebs steuert ab heute die Photonenwerfer im shack. [`//god/licht`][0.1] ist hierfür verantwortlich. @@ -23,7 +30,14 @@ installation ueberall imer genau das richtige macht. KM Pfleidi hat sich gestern (26.08.2011) Retiolum angenommen um es sauber auf OSX (und ggf. weiteren Unixartigen OSen) zum laufen zu -bringen. +bringen. Ziel ist es die Installation auf ein einfaches + $ make -C //retiolum install +zu beschraenken. + +Die Host-Dateien, welche von tinc verwendet werden koennen mit + $ make -C //retiolum update +geupdatet werden. Alle update skripte muessen auf das neue updateverfahren +ggf. umgestellt werden. In diesem Kontext sind unter anderem Skript fuer das erraten des richtigen Tinc-Konfigurationsordners [1.1] entstanden. Eine aehnliche funktionalitaet -- cgit v1.2.3 From dd12a17db78c4fcca7169b5ae8f63d31c1952f32 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Aug 2011 15:37:25 +0200 Subject: Adding jungletrain --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) diff --git a/streams/stream.db b/streams/stream.db index e97a202e..34acaa71 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -4,3 +4,4 @@ http://streams.xenim.de/radiotux.ogg radiotux http://bassdrive.com/v2/streams/BassDrive.pls bassdrive http://somafm.com/illstreet.pls illstreet http://localhost:8000/stream.ogg icecast +http://stream2.jungletrain.net:8000 jungletrain -- cgit v1.2.3 From 3331e19088e8024e747a703e499226831b367730 Mon Sep 17 00:00:00 2001 From: Momo Date: Sat, 27 Aug 2011 16:43:00 +0200 Subject: phil -> jj --- cholerab/shirts/bestellliste | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste index 08bd72dc..bc93eb84 100644 --- a/cholerab/shirts/bestellliste +++ b/cholerab/shirts/bestellliste @@ -10,7 +10,7 @@ Tensai 1 L jj Momo 1 2 jj Der Siebdruck sieht echt gut aus, kein bisschen verschmiert. hadez 1 L jj 1 M jj -Phil 1 S -- +Phil 1 S jj Lukas 1 M ?j Jan 1 2 -- Ronny 1 M -- -- cgit v1.2.3 From 51d1007f9a0f13e57c1f2107bbdb7083645cc401 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 27 Aug 2011 17:22:06 +0200 Subject: bestellliste: add pfleidi et al --- cholerab/shirts/bestellliste | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste index 08bd72dc..41f8e957 100644 --- a/cholerab/shirts/bestellliste +++ b/cholerab/shirts/bestellliste @@ -5,15 +5,15 @@ ulrich 1 M ?j gut felix 2 M jj 1 S jj Lassulus 2 M jj -Pfleidi 1 L -- +Pfleidi 1 L -j Tensai 1 L jj Momo 1 2 jj Der Siebdruck sieht echt gut aus, kein bisschen verschmiert. hadez 1 L jj 1 M jj Phil 1 S -- Lukas 1 M ?j -Jan 1 2 -- -Ronny 1 M -- +Jan 1 2 jj /* bezahlt an makefu */ Zitrone waere leckerer gewesen +Ronny 1 M jj /* bezahlt an pfleidi */ Marc 1 L -- Lotho 1 X -- Sascha 1 X -- -- cgit v1.2.3 From 7a97f9d4baff89bbcfa4bef93ab4d4246b2b82e6 Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 27 Aug 2011 17:24:04 +0200 Subject: bestellliste: add comment felix --- cholerab/shirts/bestellliste | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste index 2be21bcf..f775514e 100644 --- a/cholerab/shirts/bestellliste +++ b/cholerab/shirts/bestellliste @@ -2,7 +2,7 @@ tv 2 M j- 1 S j- ulrich 1 M ?j gut -felix 2 M jj +felix 2 M jj super qualitaet, sogar nach dem waschen kein bisschen ausgebleicht 1 S jj Lassulus 2 M jj Pfleidi 1 L -j -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 From cd79f9f962d952843b90342bdd48adb38836caab Mon Sep 17 00:00:00 2001 From: jvanvinkenroye Date: Mon, 29 Aug 2011 20:01:33 +0300 Subject: Added Tormented Radio http://www.tormentedradio.com/ --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) diff --git a/streams/stream.db b/streams/stream.db index 34acaa71..5efeb9ea 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -5,3 +5,4 @@ http://bassdrive.com/v2/streams/BassDrive.pls bassdrive http://somafm.com/illstreet.pls illstreet http://localhost:8000/stream.ogg icecast http://stream2.jungletrain.net:8000 jungletrain +http://playlist.tormentedradio.com/tormentedradio.pls tormented -- cgit v1.2.3 From 40474badc13adff28f34424b860500c45871f781 Mon Sep 17 00:00:00 2001 From: tv Date: Wed, 31 Aug 2011 23:49:52 +0200 Subject: //god/Reaktor: initial commit --- god/Reaktor | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 god/Reaktor diff --git a/god/Reaktor b/god/Reaktor new file mode 100755 index 00000000..54bc5099 --- /dev/null +++ b/god/Reaktor @@ -0,0 +1,22 @@ +#! /usr/bin/env python + +import socket +from struct import unpack + +listen_address = '0.0.0.0' +listen_port = 2342 + +# create udp socket +mysocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + +# allow send/recieve from broacast address +mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_BROADCAST,1) + +# allow the socket to be re-used +mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1) +mysocket.bind((listen_address, listen_port)) + +while True: + dev, state = unpack('BB', mysocket.recv(2)) + print "dev: " + str(dev) + print "state: " + str(state) -- cgit v1.2.3 From 73f953023b0baae827d1f5f288a9629c67db10c3 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Sep 2011 00:31:07 +0200 Subject: Reaktor: add shackspace map --- god/Reaktor | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/god/Reaktor b/god/Reaktor index 54bc5099..47d2d7c9 100755 --- a/god/Reaktor +++ b/god/Reaktor @@ -1,11 +1,36 @@ -#! /usr/bin/env python +#! /usr/bin/env python2 +# coding=UTF-8 +location = 'shackspace' +host = '0.0.0.0' +port = 2342 + +map = { + 'shackspace': { + 'device': { + 0: 'Licht0, Tensau\'s Kuschelecke; Fenster', + 1: 'Licht1, Sofaecke; Fenster', + 2: 'Licht2, Tensau\'s Kuschelecke; Ghetto', + 3: 'Licht3, Sofaecke; Ghetto', + 4: 'Licht4, Richtung Getränkelager', + 5: 'Licht5, Porschekonsole', + 6: 'Licht6, Tomatenecke', + 7: 'Licht7, Ghetto', + 10: 'Hauptschalter' + }, + 'state': { + 0: 'aus', + 1: 'an', + 2: 'aus in T-10s' + }, + '->': 'ist' + } +} + import socket +from string import join from struct import unpack -listen_address = '0.0.0.0' -listen_port = 2342 - # create udp socket mysocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) @@ -14,9 +39,12 @@ mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_BROADCAST,1) # allow the socket to be re-used mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1) -mysocket.bind((listen_address, listen_port)) +mysocket.bind((host, port)) + +map = map[location] while True: - dev, state = unpack('BB', mysocket.recv(2)) - print "dev: " + str(dev) - print "state: " + str(state) + did, sid = unpack('BB', mysocket.recv(2)) + device, state = map['device'][did], map['state'][sid] + arrow = map['->'] + print join([device, arrow, state], ' ') -- cgit v1.2.3 From 782d39c495f08da23b57e9df74b2f45f21097928 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Sep 2011 01:52:31 +0200 Subject: Reaktor: Tensau's Ecke ist die Zickenzone --- god/Reaktor | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/god/Reaktor b/god/Reaktor index 47d2d7c9..9708d9bc 100755 --- a/god/Reaktor +++ b/god/Reaktor @@ -8,9 +8,9 @@ port = 2342 map = { 'shackspace': { 'device': { - 0: 'Licht0, Tensau\'s Kuschelecke; Fenster', + 0: 'Licht0, Zickenzone; Fenster', 1: 'Licht1, Sofaecke; Fenster', - 2: 'Licht2, Tensau\'s Kuschelecke; Ghetto', + 2: 'Licht2, Zickenzone; Ghetto', 3: 'Licht3, Sofaecke; Ghetto', 4: 'Licht4, Richtung Getränkelager', 5: 'Licht5, Porschekonsole', -- cgit v1.2.3 From 5ad8c950f59472d1d0ad21c13320024889fe2e46 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Sep 2011 02:20:34 +0200 Subject: //god/Reaktor/index: initial commit This wrapper script downloads and configures jsonbot as necessary. --- .gitignore | 1 + god/Reaktor | 50 --------------------------------------------- god/Reaktor/index | 36 ++++++++++++++++++++++++++++++++ god/Reaktor/lib/listener.py | 50 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 87 insertions(+), 50 deletions(-) delete mode 100755 god/Reaktor create mode 100755 god/Reaktor/index create mode 100755 god/Reaktor/lib/listener.py diff --git a/.gitignore b/.gitignore index ee908b65..2c765648 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ a.out *.o *.a .svn/ +/god/Reaktor/tmp/ /bin/ /node/src /node/out diff --git a/god/Reaktor b/god/Reaktor deleted file mode 100755 index 9708d9bc..00000000 --- a/god/Reaktor +++ /dev/null @@ -1,50 +0,0 @@ -#! /usr/bin/env python2 -# coding=UTF-8 - -location = 'shackspace' -host = '0.0.0.0' -port = 2342 - -map = { - 'shackspace': { - 'device': { - 0: 'Licht0, Zickenzone; Fenster', - 1: 'Licht1, Sofaecke; Fenster', - 2: 'Licht2, Zickenzone; Ghetto', - 3: 'Licht3, Sofaecke; Ghetto', - 4: 'Licht4, Richtung Getränkelager', - 5: 'Licht5, Porschekonsole', - 6: 'Licht6, Tomatenecke', - 7: 'Licht7, Ghetto', - 10: 'Hauptschalter' - }, - 'state': { - 0: 'aus', - 1: 'an', - 2: 'aus in T-10s' - }, - '->': 'ist' - } -} - -import socket -from string import join -from struct import unpack - -# create udp socket -mysocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - -# allow send/recieve from broacast address -mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_BROADCAST,1) - -# allow the socket to be re-used -mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1) -mysocket.bind((host, port)) - -map = map[location] - -while True: - did, sid = unpack('BB', mysocket.recv(2)) - device, state = map['device'][did], map['state'][sid] - arrow = map['->'] - print join([device, arrow, state], ' ') diff --git a/god/Reaktor/index b/god/Reaktor/index new file mode 100755 index 00000000..6470298e --- /dev/null +++ b/god/Reaktor/index @@ -0,0 +1,36 @@ +#! /bin/sh +# +# //god/Reaktor - listen to UDP events and forward them to IRC +# +# export host passwd printto to configure jsb-udp +# +set -euf +cd $(readlink -f $(dirname $0)) + +listener=$(readlink -f lib/listener.py) + +jsb_version=0.7.1.2 +distdir=jsb-$jsb_version.tar.gz + +host=${host-91.206.142.247} +passwd=${passwd-h4x0r} +printto=${printto-#shackspace} + +if ! test -x tmp/jsb-$jsb_version; then + mkdir -p tmp + cd tmp + curl -f http://jsonbot.googlecode.com/files/jsb-$jsb_version.tar.gz | tar zx + cd jsb-$jsb_version + bin/jsb-udp -s ': 'ist' + } +} + +import socket +from string import join +from struct import unpack + +# create udp socket +mysocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + +# allow send/recieve from broacast address +mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_BROADCAST,1) + +# allow the socket to be re-used +mysocket.setsockopt(socket.SOL_SOCKET,socket.SO_REUSEADDR,1) +mysocket.bind((host, port)) + +map = map[location] + +while True: + did, sid = unpack('BB', mysocket.recv(2)) + device, state = map['device'][did], map['state'][sid] + arrow = map['->'] + print join([device, arrow, state], ' ') -- cgit v1.2.3 From 6b755ec0116304751c5a1b064da695bcde132f6d Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Sep 2011 10:51:54 +0200 Subject: //node/tools: initial commit This was missing in the previous commit...-_- --- node/tools/latest-version | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 node/tools/latest-version diff --git a/node/tools/latest-version b/node/tools/latest-version new file mode 100755 index 00000000..b99276d5 --- /dev/null +++ b/node/tools/latest-version @@ -0,0 +1,19 @@ +#! /bin/sh +# +# //node/tools/latest-version - retrieve the latest node version from the IN +# +set -euf + +# cd //node +cd $(readlink -f $(dirname $0)/..) + +# PATH prepend //util/bin +export PATH="$PWD/../util/bin${PATH+:$PATH}" + +# TODO punani install executable: curl + +curl -fsS http://nodejs.org/ | + hrefs | + sed -n 's:.*node-v\([0-9.]\+\)\.tar\.gz:\1:p' | + sort | + tail -n 1 -- cgit v1.2.3 From 9198f99c6640ffc2a8de752b456a9c91f03edbcd Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 1 Sep 2011 10:54:15 +0200 Subject: //god/Reaktor: add TODO --- god/Reaktor/index | 1 + 1 file changed, 1 insertion(+) diff --git a/god/Reaktor/index b/god/Reaktor/index index 6470298e..a2e6fe61 100755 --- a/god/Reaktor/index +++ b/god/Reaktor/index @@ -33,4 +33,5 @@ sed -i ' s/^printto *=.*/printto="'$printto'"/ ' config/udp-send +# TODO output modules: stderr, jsb-udp, remount-ro, ... PYTHONUNBUFFERED=y $listener | tee /dev/stderr | bin/jsb-udp -- cgit v1.2.3