From e0622cb1ea37de31ec7bb20e7c100fd2ce54ce2c Mon Sep 17 00:00:00 2001 From: Momo Date: Sat, 6 Aug 2011 03:47:06 +0200 Subject: Added changes to Kachelmann so he can notify you when the weather changes --- kachelmann/.conditions.swp | Bin 0 -> 12288 bytes kachelmann/changes | 31 +++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) create mode 100644 kachelmann/.conditions.swp create mode 100644 kachelmann/changes diff --git a/kachelmann/.conditions.swp b/kachelmann/.conditions.swp new file mode 100644 index 00000000..a7b2f79d Binary files /dev/null and b/kachelmann/.conditions.swp differ diff --git a/kachelmann/changes b/kachelmann/changes new file mode 100644 index 00000000..dfd22b64 --- /dev/null +++ b/kachelmann/changes @@ -0,0 +1,31 @@ +#!/usr/bin/perl +use XML::Simple; +my $xml = new XML::Simple; +my $data_new = undef; +my $data_old = undef; + + +&startup; +while (true) { + if($status_new != $status_old){ + system("espeak -v de \"Das Wetter hat sich von $status_old in $status_new verändert\""); + } + sleep(300); + &get_status; +} + + +# The startup sub is used to get the first weather state. it should only be used on startup. sorry. +sub startup(){ + system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml"); + $data_new = $xml->XMLin("/tmp/kachelmann/weather.xml"); + $data_new = $data_new->{weather}->{current_conditions}->{condition}->{data}; +} + +# The get_status sub moves the current data to $data_old and then gets a new one from Googles API +sub get_status(){ + system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml"); + $data_old = $data_new; + $data_new = $xml->XMLin("/tmp/kachelmann/weather.xml"); + $data_new = $data_new->{weather}->{current_conditions}->{condition}->{data}; +} -- cgit v1.2.3 From c89f52712da303995c07d367e7ec097a5e49e1bb Mon Sep 17 00:00:00 2001 From: Momo Date: Sat, 6 Aug 2011 03:54:03 +0200 Subject: Deleted deprecated stuff --- kachelmann/conditions.pl | 7 ------- 1 file changed, 7 deletions(-) delete mode 100755 kachelmann/conditions.pl diff --git a/kachelmann/conditions.pl b/kachelmann/conditions.pl deleted file mode 100755 index 6d8b5541..00000000 --- a/kachelmann/conditions.pl +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/perl -use XML::Simple; -system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml"); -my $xml = new XML::Simple; -my $data = $xml->XMLin("/tmp/kachelmann/weather.xml"); -my $sentence = "Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Celsius\n"; -system("espeak \"$sentence\""); -- cgit v1.2.3 From 1fdde2c2db21f69a3751c44d858b9179fe1a0131 Mon Sep 17 00:00:00 2001 From: Momo Date: Sat, 6 Aug 2011 03:58:02 +0200 Subject: Added .gitignore --- kachelmann/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 kachelmann/.gitignore diff --git a/kachelmann/.gitignore b/kachelmann/.gitignore new file mode 100644 index 00000000..9c17d493 --- /dev/null +++ b/kachelmann/.gitignore @@ -0,0 +1,2 @@ +conditions.pl +*.swp -- cgit v1.2.3 From 25d427e60136ca349791f7fce3bb717aba8f0512 Mon Sep 17 00:00:00 2001 From: Momo Date: Sat, 6 Aug 2011 03:59:00 +0200 Subject: fixed my idiocy --- kachelmann/.gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kachelmann/.gitignore b/kachelmann/.gitignore index 9c17d493..050dfb2e 100644 --- a/kachelmann/.gitignore +++ b/kachelmann/.gitignore @@ -1,2 +1,2 @@ conditions.pl -*.swp +.*.swp -- cgit v1.2.3 From c0230d4be08c6696365239e15efee82742cba25f Mon Sep 17 00:00:00 2001 From: makefu Date: Sat, 6 Aug 2011 20:08:33 +0200 Subject: util/bin/galileo: compliance to changed tts-behavior --- util/bin/galileo | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/util/bin/galileo b/util/bin/galileo index 8ca7d834..854f1302 100755 --- a/util/bin/galileo +++ b/util/bin/galileo @@ -1,2 +1,3 @@ #!/bin/sh -./wiki.firstpar http://de.m.wikipedia.org/wiki/::Random | xargs ./naturalvoices.att +export voice=klara +./wiki.firstpar http://de.m.wikipedia.org/wiki/::Random | xargs ./naturalvoices.att -- cgit v1.2.3 From d29aa166348fd3fdb309f4038ad9216652334bb4 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 7 Aug 2011 16:00:57 +0200 Subject: kachelmann: remove need for tempfile TODO: the Makefile needs to be fixed though --- kachelmann/conditions | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/kachelmann/conditions b/kachelmann/conditions index 1a798e42..ea4ba5ca 100755 --- a/kachelmann/conditions +++ b/kachelmann/conditions @@ -1,7 +1,6 @@ #!/usr/bin/perl use XML::Simple; -system("w3m -dump \"http://www.google.com/ig/api?weather=70327-stuttgart&hl=de\" > /tmp/kachelmann/weather.xml"); +my $result = `w3m -dump "http://www.google.com/ig/api?weather=70327-stuttgart&hl=de"`; my $xml = new XML::Simple; -my $data = $xml->XMLin("/tmp/kachelmann/weather.xml"); -my $sentence = "Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n"; -system("espeak -v de \"$sentence\""); +my $data = $xml->XMLin($result); +print ("Die Wetterkondition ist: $data->{weather}->{current_conditions}->{condition}->{data}\n bei $data->{weather}->{current_conditions}->{temp_c}->{data} Grad Zelsius\n"); -- cgit v1.2.3 From c282ed39d512e92a26370497792362159b23dae5 Mon Sep 17 00:00:00 2001 From: makefu Date: Sun, 7 Aug 2011 17:32:24 +0200 Subject: stream/stream.db: added local icecast to list krebs now has icecast installed, added entry to stream.db --- streams/stream.db | 1 + 1 file changed, 1 insertion(+) diff --git a/streams/stream.db b/streams/stream.db index 6ca9a627..e97a202e 100644 --- a/streams/stream.db +++ b/streams/stream.db @@ -3,3 +3,4 @@ http://deepmix.ru/deepmix128.pls deepmix http://streams.xenim.de/radiotux.ogg radiotux http://bassdrive.com/v2/streams/BassDrive.pls bassdrive http://somafm.com/illstreet.pls illstreet +http://localhost:8000/stream.ogg icecast -- cgit v1.2.3 From 81eb6b3220ad70daba291177857f3bc05c3ec48b Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Aug 2011 17:33:21 +0200 Subject: streams/streams: add infinite loop to command --- streams/streams | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/streams/streams b/streams/streams index 607fd9e5..60a4bfc2 100755 --- a/streams/streams +++ b/streams/streams @@ -22,7 +22,7 @@ function start() { if echo "$URLS" | while read URL NAME; do if [ "$NAME" = "$REQ" ];then - tmux new-session -s streams -n streams -d "exec mplayer $URL" + tmux new-session -s streams -n streams -d "while sleep 1;do mplayer $URL;done" echo "** $REQ started" exit 1 fi -- cgit v1.2.3 From 8abe4c88585a25c5b14e672a8ae9773e19f695c4 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Aug 2011 17:34:38 +0200 Subject: icecrab/*: new module icecrab, icecast for krebs Contains a makefile which installs icecast and configures it accordingly --- icecrab/Makefile | 6 ++ icecrab/icecast.xml | 174 ++++++++++++++++++++++++++++++++++++++++++++++++++++ icecrab/icecast2 | 19 ++++++ 3 files changed, 199 insertions(+) create mode 100644 icecrab/Makefile create mode 100644 icecrab/icecast.xml create mode 100644 icecrab/icecast2 diff --git a/icecrab/Makefile b/icecrab/Makefile new file mode 100644 index 00000000..36e91b76 --- /dev/null +++ b/icecrab/Makefile @@ -0,0 +1,6 @@ +.phony: debian + +debian: + [ -e /usr/bin/icecast2 ] || apt-get install --yes icecast2 + cp icecast2 /etc/default/icecast2 + cp icecast.xml /etc/icecast2/icecast.xml diff --git a/icecrab/icecast.xml b/icecrab/icecast.xml new file mode 100644 index 00000000..7776dc36 --- /dev/null +++ b/icecrab/icecast.xml @@ -0,0 +1,174 @@ + + + 100 + 2 + 5 + 524288 + 30 + 15 + 10 + + 1 + + 65535 + + + + + shackit + + shackit + + + admin + aidsballs + + + + + + + + + krebs.shack + + + + 8000 + + + + + + + + + + + + + + + + + + 1 + + + + /usr/share/icecast2 + + + /var/log/icecast2 + /usr/share/icecast2/web + /usr/share/icecast2/admin + + + + + + + + + + access.log + error.log + + 3 + 10000 + + + + + + 0 + + + diff --git a/icecrab/icecast2 b/icecrab/icecast2 new file mode 100644 index 00000000..3a2521ff --- /dev/null +++ b/icecrab/icecast2 @@ -0,0 +1,19 @@ +# Defaults for icecast2 initscript +# sourced by /etc/init.d/icecast2 +# installed at /etc/default/icecast2 by the maintainer scripts + +# +# This is a POSIX shell fragment +# + +# Full path to the server configuration file +CONFIGFILE="/etc/icecast2/icecast.xml" + +# Name or ID of the user and group the daemon should run under +USERID=icecast2 +GROUPID=icecast + +# Edit /etc/icecast2/icecast.xml and change at least the passwords. +# Change this to true when done to enable the init.d script +ENABLE=true + -- cgit v1.2.3 From d28012696a16e7d0fa3cf20e3527b9cf5747dc3a Mon Sep 17 00:00:00 2001 From: root Date: Sun, 7 Aug 2011 21:52:13 +0200 Subject: initial vomit --- cholerab/pleni/camplist | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 cholerab/pleni/camplist diff --git a/cholerab/pleni/camplist b/cholerab/pleni/camplist new file mode 100644 index 00000000..d5ba3cca --- /dev/null +++ b/cholerab/pleni/camplist @@ -0,0 +1,36 @@ +Kochfeld +Topf 2x3l +Pfanne +Teller +Gläser +Besteck +Wasschüsseln Wasserbeutel +6x Fertiggericht Spaghetti +Chilli +Fryhstyck: + Brötchen + Brot + Schinken (geraucht) + Salami + H-Milch + Müsli + Butter + Senf + Ketchup + Gurken + Marmelade + $Haselnusscreme + +Linsensuppe + Spätzle + Saiten +Ghoularschsuppe +Freitagsgemöse: + Zwiebeln + Knoblauch + Plize (pfifferlinge) + Paprika + Pfeffer + Salz + Gemöse + + + -- cgit v1.2.3