10 files changed, 81 insertions, 14 deletions
diff --git a/cholerab/ledger-spec.markdown b/cholerab/ledger-spec.markdown
new file mode 100644
index 00000000..15a290bf
--- /dev/null
+++ b/cholerab/ledger-spec.markdown
@@ -0,0 +1,9 @@
+# Format
+
+    DATE DESTINATION-ACCOUNT SOURCE-ACCOUNT AMOUNT UNIT [COMMENT...]
+
+# Example
+
+    2013-01-01 krebs-ml amazon 30 EUR C0DE-AAAA-BBBB-CCCC
+    2013-02-02 momo krebs-ml 50 EUR C0DE-AAAA-BBBB-CCCC
+    2013-02-02 mindfactory momo 80 EUR
diff --git a/god/ivan/ivan b/god/ivan/ivan
index 5099114a..c28bd3cb 100755
--- a/god/ivan/ivan
+++ b/god/ivan/ivan
@@ -1,5 +1,7 @@
 #!/bin/bash
-SATZ_LISTE=/krebs/ivan/satz-liste
+
+cd $(dirname $(readlink -f $0))
+SATZ_LISTE=satz-liste
 p="${noise_pitch-10}"
 v="${noise_lang-de}"
 k="${noise_capital-0}"
@@ -13,6 +15,9 @@ function helpme ()
   $0 [-d]
     -d   -- daemonize
     -h   -- this help file
+
+  environment:
+     USING_ESPEAK   - if set, ivan will talk with espeak
 EOF
   exit 0
 }
@@ -21,7 +26,11 @@ EOF
 
 while true
 do
-  espeak -v $v -p $p -k $k -a $a -g $g "`shuf \"$SATZ_LISTE\" | tail -1`"
+  if [ -n "${USING_ESPEAK:-}" ];then
+    espeak -v $v -p $p -k $k -a $a -g $g "`shuf \"$SATZ_LISTE\" | tail -1`"
+  else
+    ../../util/bin/naturalvoices2.sh "`shuf  \"$SATZ_LISTE\" | tail -1`"
+  fi
   [ ! "${1:-}" = "-d" ] && exit 0   # break if not daemonized
   sleep $((${RANDOM}%${RND_DELAY}))
 done
diff --git a/infest/deploy-ssh-keys b/infest/deploy-ssh-keys
new file mode 100644
index 00000000..1d0587d5
--- /dev/null
+++ b/infest/deploy-ssh-keys
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd $(dirname $0)
+U="${1:-$USER}"
+H="$(grep "^$U" /etc/passwd | cut -d : -f 6)"
+echo "deploying for user $U to $H/.ssh"
+mkdir -p $H/.ssh
+chown $U $H
+chown $U $H/.ssh
+cp -vr skel/home/.ssh/authorized_keys $H/.ssh
diff --git a/retiolum/README b/retiolum/README
index 2855fb80..6e39f1d5 100644
--- a/retiolum/README
+++ b/retiolum/README
@@ -15,8 +15,11 @@ as root:
 Get the hosts
 -------------
 
-    wget http://euer.krebsco.de/retiolum/hosts.tar # for all the hosts
-    wget http://euer.krebsco.de/retiolum/supernodes.tar # only for supernodes, (deploy on wrt routers for example)
+    wget http://euer.krebsco.de/retiolum/hosts.tar.gz # for all the hosts
+    wget http://euer.krebsco.de/retiolum/supernodes.tar.gz # only for supernodes, (deploy on wrt routers for example)
+
+    # quick update
+    curl http://euer.krebsco.de/retiolum/supernodes.tar.gz | gunzip | tar x -C /etc/tinc/retiolum/hosts
 
 Update your hosts file
 ----------------------
diff --git a/retiolum/hosts/filebitch b/retiolum/hosts/filebitch
index 3d9d9bd6..64c88cb0 100644
--- a/retiolum/hosts/filebitch
+++ b/retiolum/hosts/filebitch
@@ -1,11 +1,11 @@
-Subnet = 10.243.131.98
-Subnet = 42:0356:a364:cc79:4c96:2c7c:13fc:0c5b
+Subnet = 10.243.189.130
+Subnet = 42:c64e:011f:9755:31e1:c3e6:73c0:af2d
 
 -----BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAuK4k5fCN0u9toyd3XwMKzOxKn6s5DlnFGVcmBoaOXfwZbJDJsmf7
-xt6BZ62zMzlno2jc4ankv2flkmWruuiti/sDzMJ6Q+BFurYNVE5GqiS6V3NPpvmY
-ugNZhj5jodQOg76xOOF+igtl3v/GMdfuUvkTzoaSMb5H8QzcVvh734YTPjXGhQeL
-QdGb28pKFoE1xA1R9Zhsdt7eW9GwkJ5MhoDjzgRP9+mGUTE9Bl2jM2w6UajLzqdJ
-Yi1cY6Dtl/FGXFjQY3EABq8AUhfwXTtWk/vRSg5ym0TM5PJY6OcjnkY2rw3tue83
-8q4yT5tTCi5GQlGHAK10LoGTF53ON2XWBwIDAQAB
+MIIBCgKCAQEA2VjW30A3uQoo5QwbFTnl5fuGg81DZVu8HXmDwgEkhZYr5Xf3V5/d
+fmPlX1igzatWYX0OylFAY69r0V4dqeTubIf83sz1eqtpXjK4czG8A3wMHEXj5Pzs
+e1Qh8K4rHMEATc7Y/cwpQBi2THn2bhufqgaz94m8HrStCZcKCin3fDMbE01WHWX1
+KFqeBtUd7b9pWbXKlLBNpHTZoGxVQk0Hto9pxYzHecRsbQXykYk3Rw2tSuf0aH99
+oY0i3LjOb+f2oq2S4qVHqHZsMJfDVr+x2/LP1SIcc1lVTztWSSAzZEokE0/ejvXf
+wkquBVHXdl6LuzH+/V1I7OsaMhHShYu1LwIDAQAB
 -----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/kabinett b/retiolum/hosts/kabinett
new file mode 100644
index 00000000..3e25e84c
--- /dev/null
+++ b/retiolum/hosts/kabinett
@@ -0,0 +1,11 @@
+Subnet = 10.243.152.16
+Subnet = 42:b02f:92dc:7e87:c43e:d038:d7e8:e37a
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEAp/JSFNCRrCDPrck/L63reWa9iyowqE1luixmC5YTipg6x8LR0+l4
+WloHKzfvTEeK1eBq2v0a9MPc+/KbAACezId3iRqS7b1cv9EPjoa449m4Ti5KYdYv
+SZ974Zd1xS9t3cMsax6SAN0JMhh5t0/xb3hXBnb/YPkwQ+urj87ddAhvcs2XtEQ2
++Z6BPcrQzU9lkGzQkRgmk9O1PLA8cRbhxuBbk/gI90q4UwuP+VjGyKsqz9eJs24j
+n1dRVGYP5nv1L0nL8qZsY/rKfTv0RJC1LIUcc0W9G4xy/fCL9FYaCGRzWEdbptCW
+i5gIY3dIOBJo0aZsrsfz3idug72adTMLXQIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/soundflower b/retiolum/hosts/soundflower
new file mode 100644
index 00000000..25de9776
--- /dev/null
+++ b/retiolum/hosts/soundflower
@@ -0,0 +1,11 @@
+Subnet = 10.243.69.184
+Subnet = 42:5f6b:4756:e6a3:d304:adad:fef8:7e2f
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIBCgKCAQEA0a0oenAy9MDa2M6NoLtB8elduGgc3oLtUwsm3iUu6w8L+Je5TndN
+H8dPn3sByUk1Jkd8tGGRk/vSFj/mtUn7xXKCnFXfKDqVowu/0KS3Q+6o4mcoATeb
+Ax7e6Cz1YH5+qhQjR7apuase9X9Dzp56//5VW2gaScvWevvzrij2x7eNvJRF+W/l
+FDXc8zBPkFW5TLFHOizRoLl4mK1hz2NrUiqcq5Ghs2yPsFxl/o5+e2MOwtdI49T6
+lMkeshAeNOSMKYfP9nmHZoKI/MIpGak0EF3ZQtLvyv+tM2Q0nuwH3RvxlK/Xf6U+
+8SoQu4yRIeK+pMiLEHhFPzBpk+sblUlG7QIDAQAB
+-----END RSA PUBLIC KEY-----
diff --git a/services/etc/services/bootstrap b/services/etc/services/bootstrap
index 65f6b541..7dd9976c 100644
--- a/services/etc/services/bootstrap
+++ b/services/etc/services/bootstrap
@@ -9,4 +9,5 @@ services://heidi:22
 services://geisha:22
 services://slowpoke:22
 services://omo:22
-services://pic:22
+services://pico:22
+services://cband:22
diff --git a/util/bin/naturalvoices2.sh b/util/bin/naturalvoices2.sh
index 4d8015aa..c310414f 100755
--- a/util/bin/naturalvoices2.sh
+++ b/util/bin/naturalvoices2.sh
@@ -1,6 +1,10 @@
+#!/bin/sh
 text=$(echo $* | sed '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')
+TMPFILE=`mktemp`
+trap "rm $TMPFILE" TERM INT EXIT
 
+wget $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') -O $TMPFILE
+aplay $TMPFILE
diff --git a/util/bin/naturalvoices3.sh b/util/bin/naturalvoices3.sh
new file mode 100755
index 00000000..6085e511
--- /dev/null
+++ b/util/bin/naturalvoices3.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+text=$(echo $* | sed 's/ /+/g')
+voice="klara"
+base_url="http://192.20.225.36"
+
+TMPFILE=`mktemp`
+trap "rm $TMPFILE" TERM INT EXIT
+
+ wget $base_url$( curl  -Ss  -H 'Host:192.20.225.36' -H 'Origin:http://www2.research.att.com' -e "http://www2.research.att.com/~ttsweb/tts/demo.php" -A "Mozilla/5.0 (X11; Linux x86_64; rv:23.0) Gecko/20100101 Firefox/23.0" -d "voice=$voice" -d "txt=$text" -d "speakButton=SPEAK" -H 'Accept:text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' $base_url/tts/cgi-bin/nph-nvttsdemo | grep HREF|sed 's/.*\(".*"\).*/\1/'  |sed -e 's/"//g' ) -O $TMPFILE
+aplay $TMPFILE