Merge branch 'master' of github.com:krebscode/painload

Conflicts:
	god/temper/Makefile
	god/temper/collectd-temper.sh

9 files changed, 187 insertions, 190 deletions

diff --git a/cholerab/AGENDA b/cholerab/AGENDA
index d2c1ae1f..7db8100f 100644
--- a/cholerab/AGENDA
+++ b/cholerab/AGENDA
@@ -1,9 +1,5 @@
 
 - krebs
-  - krebs.no.de/hosts.tar automatic via github POST hook
-    - same for supernode updates [vs. cron]
-    - krebscode/painload/supernode/foo 
-
   - overall
     - krebs/bin at the end of PATH
 
diff --git a/cholerab/pattern/README b/cholerab/ENTERPRISE_PATTERN
index 0980ac6e..4e417709 100644
--- a/cholerab/pattern/README
+++ b/cholerab/ENTERPRISE_PATTERN
@@ -65,4 +65,20 @@ Literate Programming
 --------------------
 Omit all the comments.
 
+Litterate Programming
+---------------------
+Write throw-away code and it will become production code
+
+Enterprise Expect
+-----------------
+Because you always know what you want, `expect(3)` script code can be replaced
+by a `subshell and pipe` pattern :
+
+<code>
+    ( echo "$username"; sleep 1; echo "$password"; sleep 1; echo "cp old new" ) | telnet 
+</code>
+
+painload example: `//retiolum/bin/announce_pubkey`
+
+
 
diff --git a/cholerab/assets/ass.txt b/cholerab/assets/ass.txt
deleted file mode 100644
index f10d2ba1..00000000
--- a/cholerab/assets/ass.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-ass usages:
-
-$0 create name
-  if not "create name" in history and name is not retarded:
-    echo "timestamp: create name" >> history
-
-$0 set name property value
-  if "create name" in history and property is not retarded:
-    echo "timestamp: set name property value" >> history
diff --git a/cholerab/assets/lexikon.txt b/cholerab/assets/lexikon.txt
deleted file mode 100644
index 0d362100..00000000
--- a/cholerab/assets/lexikon.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-
-asset / N assets
-
-platz / plaetze
-
-root-server
-
-shared root-server
-
-recht / rechte
-
-datenbank
diff --git a/cholerab/assets/structs.nojson b/cholerab/assets/structs.nojson
deleted file mode 100644
index 4c084862..00000000
--- a/cholerab/assets/structs.nojson
+++ /dev/null
@@ -1,43 +0,0 @@
-"name": // default: random (gensym)
-  "type": "grafikkarte"
-  "location": "kremium"
-  "amount": 23 // default: 1
-  "owner": "shack" // default: krebs
-
-"nebula":
-  "type": "location"
-  "owner": "tv"
-
-"tv":
-  "type": "owner"
-
-"grafikkarte":
-  "type": "type"
-
-"amount":
-  "type": "natural"
-
-"root-server":
-  "type": "irgend ein owner ist root"
-
-"shared":
-  "type": "alle owner sind root"
-
-"oxberg":
-  "type": "root-server"
-  "location": "de"
-  "ipv4-address": "84.23.80.172"
-  "isp": "euserv"
-  "ram": "512MiB"
-
-"ram":
-  "must-match": /[0-9]+[MGk]iB/
-
-"kremium":
-  "location": "nebula"
-  "type": "root-server"
-  "shared": true
-
-"euserv":
-  "type": "ISP"
- 
diff --git a/cholerab/assets/usecases.txt b/cholerab/assets/usecases.txt
deleted file mode 100644
index a3e2a4fa..00000000
--- a/cholerab/assets/usecases.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-# use case #1: asset einsetzen
-  Hat Krebs ein Grafikkarte, die gute genug ist.
-  Wenn ja, dann will ich die in mein Computer einbauen.
-
-# use case #2: asset soll in der Ursprungszustand versetzt werden.
-  Urkrebs Mainboard-Batterie is leer und braucht Ersatz.
-  Haben wir so eine Batterie und falls ja, dann soll sie
-  fuer immer in Urkrebs rein.
-
-# use case #3: asset einlagern
-  Grafikkarte aus use case #1 (#2) soll wieder zurueck.
-
-# use case #4: asset ausschlachten
-  Urkrebs ist bis auf das Netzteil zerstoert worden,
-  das Netzteil soll eingelagert werden.
-
-# use case #5: asset hinzufuegen
-  Krebs erhaelt einen neuen Computer.
-
-# use case #6: asset finden
-  Wo oder bei wem ist das USB-Thermometer?
-
-# use case #7: asset details finden
-  Wie viele 4-Port-USB-Hubs hat krebs und wo sind die?
-
-# use case #8: verlust eines assets
-  Urkrebs ist physikalisch verschwunden, aber noch in der datenbank
-  eingetragen.
-  Welt der Dinge und der Daten muessen wieder synchron sein.
-
-# use case #9: asset anzahl erniedrigen; assets mergen
-  Eines von hundert 4-Port-USB-Hubs soll von platz X entnommen werden
-  und an ein asset gestoepselt werden.
-
-# use case #A: asset entfernen
-  Urkrebs wir vom Besitzer ausserhalb von krebs benoetigt und dem Bestand
-  entnommen.
-
-# use case #B: verlust eines platzes 
-  platz ist explodiert und ein Teil der eingelagerten assets wurde vernichtet,
-  der andere Teil muss migriert werden.
-
-# use case #C: assets eines platzes erfragen
-  Was in an platz X eingelagert?
-
-# use case #D:
-  X war noch nie KM, hat aber unberechtigter weise assets, plaetze, rechte.
-  assets muessen an andere plaetze migriert werden.
-  dinge, die wie assets waren, aber nie wirklich assets waren, muessen aus der
-  datenbank entfernt werden.
-  plaetze muessen aus datenbank entfernt werden.
-  X muss entrechtet werden.
-
-# use case #E: assets in assets
-  Batterien liegen im Bankschliesfach X an platz Y.
-
-# use case #F:
-  ein root-server ist verschwunden.
-
-# use case #G:
-  welche shared root-server hat krebs in uk?
-
-# use case #H:
-  ein asset soll umbenannt werden, da der alte name nicht passend war.
-
-# use case #I:
-  welchen namen hat der Rechner, auf dem ich gerade bin?
-
-# use case #I.2:
-  welchen namen hat das asset in meiner Hand?
-
diff --git a/cholerab/bling/krebs_aquarium.svg b/cholerab/bling/krebs_aquarium.svg
new file mode 100644
index 00000000..ad53cfca
--- /dev/null
+++ b/cholerab/bling/krebs_aquarium.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg4376"
+   version="1.1"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="krebs_aquarium.svg">
+  <defs
+     id="defs4378" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="28.963094"
+     inkscape:cx="9.7979626"
+     inkscape:cy="9.1371782"
+     inkscape:document-units="px"
+     inkscape:current-layer="a4396"
+     showgrid="true"
+     showguides="true"
+     width="16px"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="false"
+     inkscape:bbox-paths="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:window-width="483"
+     inkscape:window-height="747"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4384"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4381">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <a
+       id="a4396">
+      <a
+         id="a4960"
+         transform="translate(5e-6,1)" />
+      <a
+         transform="translate(7.000005,1)"
+         id="a4960-3">
+        <path
+           id="rect5009-9"
+           transform="translate(0,1036.3622)"
+           style="fill:#e4002b;fill-opacity:1"
+           d="m 4.999995,10 5e-6,1 0,2 1,0 0,1 -2,0 -5e-6,-2 0,-1 0,-1 z M -2,11 l -5e-6,-1 1,0 0,1 0,1 5e-6,2 -2,0 0,-1 1,0 z m -3.000005,-10.0003 0,3 1,0 0,-3 1,0 0,5 -1,0 0,1 2,0 0,-1 1,0 0,-1 1,0 0,-1 -1,0 0,-2 2,0 0,3 2,0 0,-1 -1,0 0,-2 2,0 0,3 0,1 1,0 0,1 2,0 0,-1 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 1,0 0,3 1,0 0,-3 1,0 0,4.9553 -1,0.045 0,2 -3,0 0,1 2,0 0,1 1,0 0,1 0,3 -1,0 0,-3 L 6.01656,11 6,10 l -3,0 0,4 -1,0 0,-3 -1,0 0,3 -1,0 0,-4 -3,0 0,1 -1,0 0,3 -1,0 0,-3 -5e-6,-1 1,0 5e-6,-1 2,0 0,-1 -3,0 0,-2 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 z" />
+      </a>
+    </a>
+  </g>
+</svg>
diff --git a/cholerab/bling/krebs_plain.svg b/cholerab/bling/krebs_plain.svg
index 3d048097..59e21f60 100644
--- a/cholerab/bling/krebs_plain.svg
+++ b/cholerab/bling/krebs_plain.svg
@@ -9,14 +9,50 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg2876"
+   width="16"
+   height="16"
+   id="svg4376"
    version="1.1"
-   inkscape:version="0.47 r22583"
-   width="891"
-   height="743"
-   sodipodi:docname="Screen Shot 2011-08-04 at 04.13.20.png">
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="krebs_plain.svg">
+  <defs
+     id="defs4378" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="28.963094"
+     inkscape:cx="7.4015919"
+     inkscape:cy="7.0928138"
+     inkscape:document-units="px"
+     inkscape:current-layer="a4396"
+     showgrid="true"
+     showguides="true"
+     width="16px"
+     inkscape:snap-bbox="true"
+     inkscape:snap-global="true"
+     inkscape:object-paths="false"
+     inkscape:bbox-paths="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-grids="true"
+     inkscape:window-width="1160"
+     inkscape:window-height="747"
+     inkscape:window-x="204"
+     inkscape:window-y="19"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4384"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
   <metadata
-     id="metadata2882">
+     id="metadata4381">
     <rdf:RDF>
       <cc:Work
          rdf:about="">
@@ -27,49 +63,41 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <defs
-     id="defs2880">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       id="perspective2884" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1436"
-     inkscape:window-height="856"
-     id="namedview2878"
-     showgrid="false"
-     inkscape:snap-to-guides="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-bbox="true"
-     inkscape:zoom="0.81830417"
-     inkscape:cx="445.5"
-     inkscape:cy="371.5"
-     inkscape:window-x="4"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2876" />
-  <path
-     style="fill:#e4002b;fill-opacity:1"
-     d="m 244.0219,617.03493 c -0.21558,-0.56245 -0.27058,-11.13745 -0.12223,-23.5 l 0.26974,-22.47737 22,-0.5 22,-0.5 0.26031,-44.76841 0.26031,-44.7684 23.23969,0.2684 23.23969,0.26841 0.257,67.7787 c 0.20362,53.70074 -0.004,67.87425 -1,68.23871 -2.76038,1.01019 -90.01678,0.97154 -90.40451,-0.04 z"
-     id="path3699" />
-  <path
-     style="fill:#e4002b;fill-opacity:1"
-     d="m 382.14297,617.3264 c -0.26297,-0.69786 -0.5896,-41.99384 -0.72584,-91.76884 l -0.24772,-90.5 -68,0 -68,0 -0.5,22.5 -0.5,22.5 -21.97012,0.27012 c -13.36172,0.16427 -22.37364,0.67349 -23,1.29959 -0.67593,0.67568 -1.20172,24.12474 -1.52988,68.22989 l -0.5,67.2004 -21.93,0.27 c -12.06149,0.14851 -22.28992,-0.0899 -22.72984,-0.52984 -0.43992,-0.43992 -0.82782,-31.38642 -0.86202,-68.77 l -0.0622,-67.97016 22.79201,-0.5 22.79201,-0.5 0.5,-46 0.5,-46 45,-0.5 45,-0.5 0,-22 0,-22 -68.5,-0.5 -68.5,-0.5 -0.26044,-44.96044 c -0.1701,-29.364 -0.62018,-45.32106 -1.29748,-46 -0.61887,-0.62038 -9.58642,-1.24117 -22.23955,-1.53956 l -21.20253,-0.5 -0.5,-44.20083 c -0.32035,-28.31979 -0.87003,-44.57056 -1.52988,-45.22989 -0.62605,-0.62554 -9.644729,-1.13497 -23.000009,-1.29916 l -21.97011,-0.27012 0,-46.49999 0,-46.500003 22.5,-0.5 22.499999,-0.5 0.5,-22.5 0.5,-22.500001 23,0 23,0 0.5,69.000001 0.5,68.999993 22.5,0 22.5,0 0.5,-68.999993 0.5,-69.000001 22.5,0 22.5,0 0,114.999994 0,115 -21.20253,0.5 c -13.06388,0.30807 -21.61243,0.91088 -22.27041,1.57041 -0.70812,0.7098 -0.97678,8.28986 -0.79747,22.5 l 0.27041,21.42959 43.93935,0.26065 c 29.90385,0.17739 44.27815,-0.0774 45,-0.79755 0.64951,-0.64801 1.25447,-9.47074 1.56065,-22.76065 l 0.5,-21.70245 21.20125,-0.5 c 15.49421,-0.36541 21.55085,-0.8496 22.5,-1.79875 0.94915,-0.94915 1.43334,-7.00579 1.79875,-22.5 l 0.5,-21.20125 21.4221,-0.27039 c 13.74507,-0.17349 21.89799,-0.66533 22.75,-1.37244 1.86497,-1.54779 1.93794,-42.34431 0.0779,-43.54815 -0.6875,-0.44496 -10.925,-1.03402 -22.75,-1.30902 l -21.5,-0.5 -0.26043,-44.93956 c -0.14323,-24.716769 0.0913,-45.291272 0.52112,-45.721122 0.42985,-0.42985 21.24704,-0.821311 46.26043,-0.869914 l 45.47888,-0.08837 0.5,68.309476 0.5,68.30949 45.5,0 45.5,0 0,-21.5 0,-21.5 -23,-0.5 -23,-0.5 0,-46.49999 0,-46.500005 46.5,0 46.5,0 0.25532,90.903935 c 0.1807,64.33897 0.57702,91.29158 1.35619,92.23042 0.83731,1.0089 6.16306,1.39102 22.24469,1.59606 l 21.1438,0.26958 0.5,21.70245 c 0.30615,13.2884 0.91117,22.11267 1.56054,22.76054 0.72197,0.7203 15.24754,0.97491 45.5,0.79755 l 44.43946,-0.26054 0.27041,-21.42959 c 0.17932,-14.2111 -0.0893,-21.79015 -0.79755,-22.5 -0.66039,-0.66191 -9.35028,-1.26123 -22.77041,-1.57041 l -21.70245,-0.5 -0.5,-44.20083 c -0.32022,-28.30803 -0.87016,-44.57069 -1.52947,-45.22947 -0.62361,-0.62311 -9.494,-1.13529 -22.5,-1.29917 l -21.47053,-0.27053 0,-46.49999 0,-46.500005 22,-0.5 22,-0.5 0.5,-22.5 0.5,-22.500001 23.5,0 23.5,0 0.5,69.000001 0.5,68.999995 22,0 22,0 0.5,-68.999995 0.5,-69.000001 23,0 23,0 0,115.499996 0,115.5 -22.5,0.5 -22.5,0.5 -0.5,45.5 -0.5,45.5 -68.5,0.5 -68.5,0.5 0,22 0,22 45.5,0.5 45.5,0.5 0.5,46 0.5,46 22.5,0.5 22.5,0.5 0,69 0,69 -23,0 -23,0 -0.25705,-67.95705 c -0.17172,-45.39696 -0.60248,-68.30329 -1.29755,-69 -0.62555,-0.62702 -9.69546,-1.24235 -22.74295,-1.54295 l -21.70245,-0.5 -0.27081,-20.92262 c -0.17312,-13.3749 -0.66822,-21.40146 -1.37245,-22.25 -1.53612,-1.85091 -133.80901,-1.97511 -135.65674,-0.12738 -0.9155,0.9155 -1.2,22.47577 -1.2,90.94098 0,49.35754 -0.36973,89.96949 -0.82162,90.24878 -0.45189,0.27928 -10.91439,0.58003 -23.25,0.66833 l -22.42838,0.16054 -0.5,-68.35931 -0.5,-68.35932 -22,0 -22,0 -0.5,68.5 -0.5,68.5 -22.77416,0.26884 c -17.67944,0.20869 -22.88111,-0.015 -23.25228,-1 z"
-     id="path3697" />
-  <path
-     style="fill:#e4002b;fill-opacity:1"
-     d="m 567.13302,617.3174 c -0.2648,-0.69275 -0.36494,-31.85984 -0.22253,-69.25984 l 0.25892,-68 23,0 23,0 0.5,45 0.5,45 22,0.5 22,0.5 0,23.5 0,23.5 -45.27747,0.26021 c -35.68808,0.2051 -45.37943,-0.007 -45.75892,-1 z"
-     id="path2921" />
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <a
+       id="a4396">
+      <path
+         id="rect4446"
+         style="fill:#e4002b;fill-opacity:1"
+         d="m 2,1038.3619 0,3 1,0 0,-3 1,0 0,5 -1,0 0,1 2,0 0,-1 1,0 0,-1 1,0 0,-1 -1,0 0,-2 2,0 0,3 2,0 0,-1 -1,0 0,-2 2,0 0,3 0,1 1,0 0,1 2,0 0,-1 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 1,0 0,3 1,0 0,-3 1,0 0,4.9553 -1,0.045 0,2 -3,0 0,1 2,0 0,2 1,0 0,3 -1,0 0,-3 -0.983435,0 -0.01656,-1 -3,0 0,4 -1,0 0,-3 -1,0 0,3 -1,0 0,-4 -3,0 0,1 -1,0 0,3 -1,0 0,-3 1,0 0,-2 2,0 0,-1 -3,0 0,-2 -1,0 0,-2 -1,0 0,-2 1,0 0,-1 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc" />
+      <a
+         id="a4960"
+         transform="translate(5e-6,1)">
+        <path
+           transform="translate(0,1036.3622)"
+           style="fill:#e4002b;fill-opacity:1"
+           d="m 5,11 1,0 0,3 -2,0 0,-1 1,0 z"
+           id="rect5009"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+      </a>
+      <a
+         transform="translate(7.000005,1)"
+         id="a4960-3">
+        <path
+           transform="translate(0,1036.3622)"
+           style="fill:#e4002b;fill-opacity:1"
+           d="m 4,11 1,0 0,2 1,0 0,1 -2,0 z"
+           id="rect5009-9"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccccc" />
+      </a>
+    </a>
+  </g>
 </svg>
diff --git a/cholerab/manifest b/cholerab/manifest
index fca99561..1e7554b9 100644
--- a/cholerab/manifest
+++ b/cholerab/manifest
@@ -2,3 +2,8 @@
 1. Everything is compromised
 2. Enterprise-patterns are FTW
 3. When in doubt, do the right thing
+
+# Purpose of Krebs
+1. Survive
+2. Spread
+3. Grow