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

10 files changed, 3 insertions, 90 deletions

diff --git a/retiolum/hosts/armageddon421_de b/retiolum/hosts/armageddon421_de
deleted file mode 100644
index 13a2c946..00000000
--- a/retiolum/hosts/armageddon421_de
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = armageddon421.de
-Port = 1655
-Subnet = 42.233.216.106/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAqBfXS402JOadodsFB4a/aX/eBkuQxPHjEPpW7QBueEPbCHBAyPnT
-GzpC9tJSfkaUfI5pL+kE5vCXqVuLErlJtESENI0FvtfFGHm/KxRwX6QEAiZZT0d0
-C331udvRwqDrjY3HVMcQo7ppcaRHTGNldIATZVVLvm8V8zJ28L/FIioGysNYFuLb
-8V5ZVTFpXwUfeJOAbmz0CHB/hiQliP0CR/Y7sZ0dX9/DAg13z2iZc2HA65N1AqZc
-L6knsC7DnzjY48d5BhbZXqcCybecx3s4igLuDZjoyHOyAtbR1QueDF/CRVnYsqSs
-YItynNjtN9TEEvCG1klvCV7hyM8t2ecpwQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/chinaman b/retiolum/hosts/chinaman
deleted file mode 100644
index 22f64b02..00000000
--- a/retiolum/hosts/chinaman
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:5a1d:f491:9e47:c4cd:175f:bd87:6da5/128
-Subnet = 42.207.40.226/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAwQWG4shbMq2Y2s2GH05DSR9God0ppslCgXLpM8I+L+khpF8JL83z
-KdevKDl0mA4iVnSgqWKVUDCK5IN29wQAlPDiNvBir98vxTeuckvdeTZat0rr0O7t
-o4MBMfZ0yXBxruu2/TjCyAkE/VN3h7tfzBh9HUQyVFWjaEhh8v2kOmGLt1UT3hKr
-KdFFtCvbIAeHa6axiQvX0kmVZY8n2XK/1pPHSuxkKWUvum1jMplIQ6NewjeTbaan
-6hNFcMFwbB333Wan1EKP3D7N/oniGspoyLXdO4Q/AXmfwMJvHdLZri4uLFMdOB/e
-n2jo/GTcm7kzUW/IibqyeBvJ6xuTaQXb7QIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/krebsbitch b/retiolum/hosts/krebsbitch
deleted file mode 100644
index a776368a..00000000
--- a/retiolum/hosts/krebsbitch
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:0398:5d7c:06c6:9978:4383:154b:3564/128
-Subnet = 42.35.192.96/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAuSPMGAVr8vLstf/4KnkFreYPhZGxmpE0IWaPIi39vz7d5Y8aE07R
-DslQNV51X6YZ0qwfu1axfgn8cd679N9+X6fVxCV22ICPq9Rv6tCU4K//b08mIgxv
-75D7RdWjPa3XbJiayK3SN8HuvcSo2cDXuvpG3D0yM5Cpjwu+40UZCVtSM7bZMY4M
-E3urXJfdPZMh5Ajst4B/s5PymaiiUadvRnbVXjWCbtWIySHgg+Rg4Ww/47Sml1MJ
-0DFEYb3RIsAW3sBsbfs54cF4jgO8YT2Pd0kIq4xey+/S14E6F6qxWizGwC2ZSF/o
-qSbE1GJ2HlwhCt+cIr0g6s9s6QtzaLE36wIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/krebsbob b/retiolum/hosts/krebsbob
deleted file mode 100644
index cd01e5a4..00000000
--- a/retiolum/hosts/krebsbob
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = krebsbob.no.de
-Port = 1655
-Subnet = 42.195.17.113/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAwF9uuth4ffpvSVd8gre70Mu6kmEQdnjlBnNu/25IPEtZIRW/nVJW
-dOMUcKdHOX8oqLhixoJ81xUmas+nPMbo6qyoPHDwMsQP4/ShvnNiTmmxHjAL3ac6
-zMSf7upnYCgY/4Btb4hIHGFEWDxkoT6PrSUCykx9TASLat8jvalOHAbbS9EjD4Fw
-WXJvoJIRCggeMggkJbiWHdKozE4ra0EUVPaVO1FJLVsmiH7q7KuF/MQwly125Mo0
-Mg3XRhEMNe7mpiTznRxwA/w8h8DRPi8Qp1cfg9vgh5bKvPMDwTWhGVEKUlWDyiob
-7LR/O3rM8qkOWI4nx5GhtxdaCt0V9tPebwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/krebsnode b/retiolum/hosts/krebsnode
deleted file mode 100644
index 187fee86..00000000
--- a/retiolum/hosts/krebsnode
+++ /dev/null
@@ -1,11 +0,0 @@
-Address = krebs.no.de
-Port = 1655
-Subnet = 42.18.77.65/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEA8V86UoV5Eu3qWyXvMSfNG/OLHu9rOREwf+aNSRlpf0zGuHtH8Hzl
-AJrfDe7ucKnn4YYhscpZB9Ae/wmQN3JytOzL1o0yxxdtehP8HjLVUCMCvF7Sx2++
-3PdpNMw7iUo08bRH8+8yRuxxJCrL+PJCbvE1/Speu/7jGioT8q+TKSl7f/bD0cSg
-3TmDRG1lHVm/Synbd/aGeuI9CewGs3WukDVC6mmpWT0Q5bCG2YwJRO2kHz3ppUEO
-sOyDfEeNiV6Cs3QF3j9DqQGIVvWrO4BKJoqhQ661UId7vokYRf3gkLSYs2/mkoWR
-gMgBzL5++u4majp3p05wXua3j07eQE9qJQIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/pa_sharepoint b/retiolum/hosts/pa_sharepoint
deleted file mode 100644
index dd31362e..00000000
--- a/retiolum/hosts/pa_sharepoint
+++ /dev/null
@@ -1,7 +0,0 @@
-Address = pa-sharepoint.informatik.ba-stuttgart.de
-Subnet = 42.80.54.58/32
------BEGIN RSA PUBLIC KEY-----
-MIGJAoGBAKSle+5vi8j+auGIC41PwFRPdzuyhP/paAEht+9mWpTYYC1meyPDwQR8
-EPNLwj1ccjsAvhubfaDmI3B13cBQx5q1BbTCK81Y5RS1tj384kvAabJAtKsz3aIg
-1hWXjiDJUGNpQhKsD7IIg4lkkDcgOBAbdtXlynCQXdQL+YjLTavBAgMBAAE=
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/temperator b/retiolum/hosts/temperator
deleted file mode 100644
index 25c54bf2..00000000
--- a/retiolum/hosts/temperator
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:0b56:87fb:b3ab:677f:1158:bfa0:b937/128
-Subnet = 42.93.117.146/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEArV5wUD4DqM0RoqL47aPb4EcK8Fi7s+PaFwSqVYibMvjeh/zbRUqa
-GQzEWa9ZR9dIzc0YNQKLOSKsiJNpdEwsWT5kUIUQq/YpFAQjcb/vEFbfZwesG08U
-bmkiqXBVaRDYgdGvnJsfkxVYFuTBKstZk5zdK4/uUSVV6oB3G1xP29Umpjn13Dc6
-28F4aYSQ6U8wJaGpZWXiQrmGtFwaM3gY7MCGq3L/5ec+qo7/zqC3BNYYbuFPycs5
-O3H/Gu1E060YsThhtC4NbChupf0llJcHa7wpPyE2f31YBAQZMo5NpmQqWWLuLqSk
-sT1QtjqIsNcMBK9ogxGb6fcMmycOUSsEFwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/urkrebs b/retiolum/hosts/urkrebs
deleted file mode 100644
index ecffaec4..00000000
--- a/retiolum/hosts/urkrebs
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:0c61:780c:bf22:7624:fca8:d4d7:a4fd/128
-Subnet = 42.171.152.235/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAl6vUmUL8w8r2gUTpUF8QWx0U3nzDPao2I7l0WU1NnGcR8DVug7YN
-595guvDkRGcM4eYGizgVYVvDCmjTQRXRn57ucVud2bGE1NGtdomVs6wggpgzLiaf
-m9BJwsigoCyMv+8ewGfc+D10TupulcIiZSp/RAewYlX0rhmgdsEGnCt+TWvXRsIa
-kY1pvt4YeKjs2ctib3OmaPuNokK4ophxSpdZ5arjHCaiVMj2O6pPAQbU7WFY63Fw
-UP64cAmtqBM+uMteT7bdG1jT3KZS6W7Dy8rIBd+pp+vB656A5PhrDcGEUMFSXqPD
-BwIxhV7OAejSn4XjrZyd5eNtMOQKopIMQwIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/retiolum/hosts/zerg b/retiolum/hosts/zerg
deleted file mode 100644
index 9e9b0a4e..00000000
--- a/retiolum/hosts/zerg
+++ /dev/null
@@ -1,10 +0,0 @@
-Subnet = 42:448b:2bdc:d090:9f0f:a957:01a7:7254/128
-Subnet = 42.20.21.115/32
------BEGIN RSA PUBLIC KEY-----
-MIIBCgKCAQEAxLkTKBXMgChxgPlMlLqqGRx/MSZos2dkXdCw7pzyO9HRwYi2Ax1j
-frVG8Z6YQJAxGv4mOtSLEkSfgzgg0AgCb1o0/fniFabYgBVBMr7K5HvnoJz+ODP2
-49O7+m8t495ygOVY/qO6u4ezSbzDTqcPUjQxUHRo1Ik4/uDjvkPe+rbxC2ZTVW/Z
-YnhSaWwH/GkzI9T8OCmAGetdrsXKY+h/ukVJB89qHXAs2fqWIUvujyfwN/mj5mx4
-BT28RJr2/Mx2ivb1Dq1t8iaxNx+I8q5/WVl0EfZBKkSHsXtqzg9xqwzMS37dF356
-0uq2uuysIDbFMXF3jYvFSZyxCmgXNzvN5QIDAQAB
------END RSA PUBLIC KEY-----
diff --git a/util/bin/naturalvoices2.sh b/util/bin/naturalvoices2.sh
new file mode 100755
index 00000000..27c4f27e
--- /dev/null
+++ b/util/bin/naturalvoices2.sh
@@ -0,0 +1,3 @@
+text=$(echo $* | sed 's/ /+/g')
+mplayer http://192.20.225.36$( curl -Ss -A "Mozilla" -d "voice=klara" -d "txt=$text" -d "speakButton=SPEAK" http://192.20.225.36/tts/cgi-bin/nph-nvdemo |grep HREF|sed 's/.*\(".*"\).*/\1/' |sed -e 's/"//g')
+