Merge branch 'master' into punani_files

7 files changed, 140 insertions, 9 deletions

diff --git a/cholerab/AGENDA.cccamp11 b/cholerab/AGENDA
index 7bdf02a3..d2c1ae1f 100644
--- a/cholerab/AGENDA.cccamp11
+++ b/cholerab/AGENDA
@@ -16,8 +16,6 @@
     - make-based installer for voice-symlinks
 
   - ttycnser
-    - server component
-      - JSON-RPC [spec and implementation]
     - client component
       - ttycnser (makefu)
       DONE - Python Notification (makefu)
@@ -99,3 +97,16 @@
     - cping, cpong
 
   - recursiv make
+
+  - exedirs
+
+  - //-integration
+    - libc?
+    - sh?
+
+  - //Schnabeltasse
+
+  - wgrep
+
+  - generated code must be created outside of the //-hierarchy, so killing
+    a local repository and recloning it is easier
diff --git a/cholerab/IRC-RPC b/cholerab/IRC-RPC
new file mode 100644
index 00000000..a5350534
--- /dev/null
+++ b/cholerab/IRC-RPC
@@ -0,0 +1,32 @@
+# Krebs IRC RPC
+
+    on :<from> PRIVMSG <target> :<handle>: <command> <argument>
+    
+      if <handle> ∈ { nickname, "ALL" }
+        if <command> is a public command
+    
+          path = $__public_command_directory/<command>
+          argv = []
+          envp = { from: <from>, argument: <argument> }
+    
+          <code> = execve(path, argv, envp) → <stdout>, <stderr>
+    
+          if <code> = 0
+            if <target> is channel
+              PRIVMSG <target> :<from>: <stdout>
+              PRIVMSG <from> :<stderr>
+            else
+              ; TODO assert <target> = <from>
+              PRIVMSG <from> :<stdout>
+              PRIVMSG <from> :Error: <stderr>
+          else
+
+            send all <.*> to the Ministerium
+    
+            if <target> is channel
+              PRIVMSG <target> :<from>: <command> is broken ATM
+            else
+              PRIVMSG <target> :Error: <command> is broken ATM
+    
+        else
+          PRIVMSG <target> :<from>: you are made of stupid
diff --git a/cholerab/Reaktor/IRC-RPC b/cholerab/Reaktor/IRC-RPC
new file mode 100644
index 00000000..a5350534
--- /dev/null
+++ b/cholerab/Reaktor/IRC-RPC
@@ -0,0 +1,32 @@
+# Krebs IRC RPC
+
+    on :<from> PRIVMSG <target> :<handle>: <command> <argument>
+    
+      if <handle> ∈ { nickname, "ALL" }
+        if <command> is a public command
+    
+          path = $__public_command_directory/<command>
+          argv = []
+          envp = { from: <from>, argument: <argument> }
+    
+          <code> = execve(path, argv, envp) → <stdout>, <stderr>
+    
+          if <code> = 0
+            if <target> is channel
+              PRIVMSG <target> :<from>: <stdout>
+              PRIVMSG <from> :<stderr>
+            else
+              ; TODO assert <target> = <from>
+              PRIVMSG <from> :<stdout>
+              PRIVMSG <from> :Error: <stderr>
+          else
+
+            send all <.*> to the Ministerium
+    
+            if <target> is channel
+              PRIVMSG <target> :<from>: <command> is broken ATM
+            else
+              PRIVMSG <target> :Error: <command> is broken ATM
+    
+        else
+          PRIVMSG <target> :<from>: you are made of stupid
diff --git a/cholerab/Reaktor/priviliged_functions b/cholerab/Reaktor/priviliged_functions
new file mode 100644
index 00000000..a673267e
--- /dev/null
+++ b/cholerab/Reaktor/priviliged_functions
@@ -0,0 +1,24 @@
+Use Case 1: Request update on Host
+=================================
+
+< user> bot: update
+< bot> /whois user
+< bot> /msg user [CHALLENGE]
+< user> /msg bot [CHALLENGE-RESPONSE]
+< bot> updating... 
+< bot> now on rev XXXXX
+
+Command Flow
+----------------
+The bot has a locally stored list of [trusted] hosts along with their public
+key, preferably from the tinc/retiolum directory.
+
+The bot encrypts a 1K Byte long message with the public key of the host
+retrieved by the /whois command.
+
+This challenge is sent to the user requesting the command via private message.
+The user then decrpyts the message with its own private key and sends the
+decrpyted message to the bot.
+
+The bot then executes the requested command if the challenge is answered
+correctly
diff --git a/cholerab/news/Candidate b/cholerab/news/Candidate
index 8abc0b00..1b52abe4 100644
--- a/cholerab/news/Candidate
+++ b/cholerab/news/Candidate
@@ -46,4 +46,14 @@ 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
+## 2. Krebs MPD + http stream
+
+KM momo hat sich heute (01.09.2011) gegen die streams gewehrt und auf der filebitch einen mpd Server eingerichtet.
+Der MPD streamt jetzt via http(vorbis) auf http://filebitch.shack:8000. 
+Eine Integration in //streams ist bereits vorgenommen. 
+Der MPD lauert auf filebitch.shack:6600 auf MPD Clients die ihn bedienen. 
+Ein Webinterface ist noch nicht geplant. 
+
+Die Musiksammlung kann in incoming/Musik auf der Filebitch erweitert werden.
+
+## 3. KNUT - Die Krebs Notification Utility Toolchain
diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste
index f1f423e1..a6c63b9d 100644
--- a/cholerab/shirts/bestellliste
+++ b/cholerab/shirts/bestellliste
@@ -1,11 +1,11 @@
           # S G∃  Feedback
 tv        2 M jj  Superdick aufgetragenes Gummifetisch Logo; Farbe: genial
-          1 S j-
+          1 S jj
 ulrich    1 M ?j  gut
 felix     2 M jj  super qualitaet, sogar nach dem waschen kein bisschen ausgebleicht
           1 S jj
 Lassulus  2 M jj
-Pfleidi   1 L -j
+Pfleidi   1 L jj
 Tensai    1 L jj
 Momo      1 2 jj  Der Siebdruck sieht echt gut aus, kein bisschen verschmiert.
 hadez     1 L jj
@@ -13,11 +13,11 @@ hadez     1 L jj
 Phil      1 S jj
 Lukas     1 M ?j
 Jan       1 2 jj /* bezahlt an makefu */ Zitrone waere leckerer gewesen 
-Ronny     1 M jj /* bezahlt an pfleidi */
+Ronny     1 M jj
 Marc      1 L --
-Lotho     1 X --
-Sascha    1 X --
-Moritz    1 M --
+Lotho     1 X jj
+Sascha    1 X -j
+Moritz    1 M jj
 RIPE      1 X --
 kh        1 L jj gute Verarbeitung, guter Gesamteindruck, passt wie angegossen
 miefda    1 L jj
diff --git a/cholerab/thesauron b/cholerab/thesauron
index 07e274f5..2c329db8 100644
--- a/cholerab/thesauron
+++ b/cholerab/thesauron
@@ -3,9 +3,31 @@ Cholerab n.
   Zusammenarbeit niemals gut, einfach und ohne Schmerzen funktioniert.
 - Teamwork-Plattform für Krebscode.
 
+KD;RP abbr. (pronounciation: kah-derp)
+- Short for Krebs Darknet / Retiolum Prefix.
+
 Nahziel n.
 - Ziel mit höchst möglicher Priorität.
 
 Nahzielerfahrung n.
 - das Erlebnis der (endgültigen) Nichterreichung eines Nahziels (obwohl
   nur noch wenig ((quasi-) infinitesimal viel) nötig gewesen wäre).
+
+Retiolum n.
+- The official darknet of Krebs which utilizes the Retiolum Prefix to
+  address individual nodes.
+
+Retiolum Prefix n.
+- The universally accepted IPv6-prefix, 42::/16.  Anyone can has a
+  /128-subnet and, if require, anything larger.
+ 
+Retiolum Realtime Map n.
+- The network map of the public visible part of Retiolum.
+
+RRM [abbr.]
+- Short for Retiolum Retiolum Map.
+
+Sanatorium n.
+- The Krebs Control and Command Center.
+- An Retiolum-based IRC-channel where all Reaktor-enabled nodes gather
+  and lurk for relevant input.