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

7 files changed, 154 insertions, 4 deletions

diff --git a/cholerab/bling/krebs_plain.png b/cholerab/bling/krebs_plain.png
index 8dcf37a7..48c481a3 100644
--- a/cholerab/bling/krebs_plain.png
+++ b/cholerab/bling/krebs_plain.png
diff --git a/cholerab/bling/krebs_plain_a4.svg b/cholerab/bling/krebs_plain_a4.svg
new file mode 100644
index 00000000..47613db2
--- /dev/null
+++ b/cholerab/bling/krebs_plain_a4.svg
@@ -0,0 +1,112 @@
+<?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="744.09448"
+   height="1052.3622"
+   id="svg4376"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   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="0.64000001"
+     inkscape:cx="331.91513"
+     inkscape:cy="497.82048"
+     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="1090"
+     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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-7.011934e-5)">
+    <a
+       id="a4396">
+      <path
+         id="rect4446"
+         style="fill:#e4002b;fill-opacity:1"
+         d="m 92.999805,447.84836 0,139.49994 46.499995,0 0,-139.49994 46.50002,0 0,232.49998 -46.50002,0 0,46.49998 93.00003,0 0,-46.49998 46.50002,0 0,-46.5 46.50001,0 0,-46.50004 -46.50001,0 0,-92.99996 93.00001,0 0,139.5 93.00004,0 0,-46.50004 -46.50001,0 0,-92.99996 93.00003,0 0,139.5 0,46.5 46.5,0 0,46.49998 93.00002,0 0,-46.49998 -46.50001,0 0,-93.00004 -46.50001,0 0,-92.99996 46.50001,0 0,-46.49998 46.50001,0 0,139.49994 46.50006,0 0,-139.49994 46.5,0 0,230.4214 -46.5,2.0925 0,92.99996 -139.50008,0 0,46.49976 93.00002,0 0,93.00042 46.50006,0 0,139.4999 -46.50006,0 0,-139.4999 -45.72973,0 -0.77,-46.49994 -139.50007,0 0,185.99984 -46.50002,0 0,-139.4999 -46.50001,0 0,139.4999 -46.50001,0 0,-185.99984 -139.50004,0 0,46.49994 -46.50002,0 0,139.4999 -46.500011,0 0,-139.4999 46.500011,0 0,-93.00042 93.00004,0 0,-46.49976 -139.500051,0 0,-92.99996 -46.500016,0 0,-92.99998 -46.500013,0 0,-92.99997 46.500013,0 0,-46.49999 z"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc"
+         inkscape:export-filename="/krebs/cholerab/bling/krebs_plain.png"
+         inkscape:export-xdpi="601.88"
+         inkscape:export-ydpi="601.88" />
+      <a
+         id="a4960"
+         transform="matrix(46.500013,0,0,46.49999,0,-47789.471)"
+         inkscape:export-filename="/krebs/cholerab/bling/krebs_plain.png"
+         inkscape:export-xdpi="601.88"
+         inkscape:export-ydpi="601.88">
+        <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="matrix(46.500013,0,0,46.49999,325.5001,-47789.471)"
+         id="a4960-3"
+         inkscape:export-filename="/krebs/cholerab/bling/krebs_plain.png"
+         inkscape:export-xdpi="601.88"
+         inkscape:export-ydpi="601.88">
+        <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/tahoe/brick_installation b/cholerab/tahoe/brick_installation
new file mode 100644
index 00000000..b319393b
--- /dev/null
+++ b/cholerab/tahoe/brick_installation
@@ -0,0 +1,18 @@
+#?/bin/sh
+# Tahoe installation
+pacman -S python2 python2-pip net-tools
+pip2 install pyasn1 zfec pycrypto zbase32 pycryptopp twisted
+pip2 install allmydata-tahoe
+
+# tahoe configuration
+mkdir /opt/tahoe
+tahoe create-node /opt/tahoe
+useradd tahoe -d /opt/tahoe
+# change nick name
+# replace introducer.furl = None with the one from pigstarter/tahoe/introducer.furl
+sed -i "s#^introducer\.furl.*#introducer.furl = $(curl pigstarter/tahoe/introducer.furl)#" /opt/tahoe/tahoe.cfg
+# you also might want to change shares.needed to 2 , shares.happy to 3 and shares.total to 6
+#
+# optionally symlink /opt/tahoe/storage to somewhere with a lot of storage
+cp tahoe.service /usr/lib/systemd/system/tahoe.service
+systemctl enable tahoe.service
diff --git a/cholerab/tahoe/client_installation b/cholerab/tahoe/client_installation
index 14a23c80..dce3742a 100644
--- a/cholerab/tahoe/client_installation
+++ b/cholerab/tahoe/client_installation
@@ -1,6 +1,6 @@
 #?/bin/sh
 # Tahoe installation
-pacman -S python2 python2-pip
+pacman -S python2 python2-pip net-tools
 pip install pyasn1 zfec pycrypto zbase32 pycryptopp twisted
 pip install allmydata-tahoe
 
diff --git a/cholerab/tahoe/tahoe.service b/cholerab/tahoe/tahoe.service
new file mode 100644
index 00000000..74a83121
--- /dev/null
+++ b/cholerab/tahoe/tahoe.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tahoe LAFS
+
+[Service]
+ExecStart=/usr/bin/tahoe run /opt/tahoe
+User=tahoe
+
+[Install]
+Alias=tahoe.service
+WantedBy=multi-user.target
diff --git a/god/ivan/naturalvoices_cached.sh b/god/ivan/naturalvoices_cached.sh
index d64d9b78..93ac1911 100755
--- a/god/ivan/naturalvoices_cached.sh
+++ b/god/ivan/naturalvoices_cached.sh
@@ -7,12 +7,12 @@
 : ${1?what to say?Please provide text as parameter.}
 
 text=$(echo $* | sed -e 's/ /+/g' -e 's/\//%2F/g')
-voice="klara"
+voice="${voice:-klara}"
 
 
-CACHE_DIR="/tmp/ivan-speech"
+CACHE_DIR="${CACHE_DIR:-/tmp/ivan-speech}"
 mkdir -p "$CACHE_DIR"
-OUTFILE="$CACHE_DIR/${text}.wav"
+OUTFILE="$CACHE_DIR/${voice}_${text}.wav"
 
 
 if [ ! -e $OUTFILE ] ;then
diff --git a/retiolum/hosts/pante_miner b/retiolum/hosts/pante_miner
new file mode 100644
index 00000000..c363681f
--- /dev/null
+++ b/retiolum/hosts/pante_miner
@@ -0,0 +1,10 @@
+Subnet = 10.243.26.211
+Subnet = 42:b6c2:e63c:d178:a71d:e36b:8ef6:abde
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA65AhOXR3oOUcJi6qxnCWC7BduLyBth8SWsXhzKvyTLEqXBH8KcuL
+H9UOrSLnwcueE2wMeHh5Rz4S3J+dwUJkGvD6eMXyJDiuIoaB8B7Iqjo1beS3gf9D
+4nOv6YBjE0LsUwGKnZIR2E852MBcKUdZx4WdAYL8lB9ucFVBjKln8GxTZ1q4GEFx
+XiCJddvCY9HnjlUBhCRghmRUYlgbhkNJhp0zclS8qXhqCa4cjrc586NY6dZDiIhY
+AivuJayZEnrM/iEFobLcQnmq8n5o9iHCKbqRhemLeO2BAwn7SwSXnF1iTqbzK5df
+zaA/G/6esPKyLfjJ7rgNBtUSfEC0Ro8yFQIDAQAB
+-----END RSA PUBLIC KEY-----