6 files changed, 128 insertions, 4 deletions
diff --git a/evan/Makefile b/evan/Makefile
new file mode 100644
index 00000000..f87e8505
--- /dev/null
+++ b/evan/Makefile
@@ -0,0 +1,9 @@
+.PHONY: infect
+INSTALL_DIR = /root/bin
+infect:
+	mkdir -p ${INSTALL_DIR}
+	cp evan ${INSTALL_DIR}
+	cp satz-liste ${INSTALL_DIR}
+	cp evan-startup /etc/init.d/evan
+	update-rc.d evan start
+
diff --git a/evan/evan b/evan/evan
new file mode 100755
index 00000000..608ac6b8
--- /dev/null
+++ b/evan/evan
@@ -0,0 +1,27 @@
+#!/bin/bash
+SATZ_LISTE=/krebs/evan/satz-liste
+p="${noise_pitch-10}"
+v="${noise_lang-de}"
+k="${noise_capital-0}"
+a="${noise_amplitude-600}"
+g="${noise_gap-1}"
+RND_DELAY=3600
+#set -x
+function helpme ()
+{
+  cat << EOF 
+  $0 [-d]
+    -d   -- daemonize
+    -h   -- this help file
+EOF
+  exit 0
+}
+
+[ "${1:-}" = "-h" ] && helpme
+
+while true
+do
+  espeak -v $v -p $p -k $k -a $a -g $g "`shuf \"$SATZ_LISTE\" | tail -1`"
+  [ ! "${1:-}" = "-d" ] && exit 0   # break if not daemonized
+  sleep $((${RANDOM}%${RND_DELAY}))
+done
diff --git a/evan/evan-startup b/evan/evan-startup
new file mode 100755
index 00000000..8a7f8daa
--- /dev/null
+++ b/evan/evan-startup
@@ -0,0 +1,74 @@
+#! /bin/sh
+#
+### BEGIN INIT INFO
+# Provides:          evan
+# Required-Start:    $remote_fs $network
+# Required-Stop:     $remote_fs $network
+# Should-Start:      $syslog $named
+# Should-Stop:       $syslog
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Start evan daemons
+# Description:       
+
+### END INIT INFO
+#
+# Based on Lubomir Bulej's Redhat init script.
+
+DAEMON="/root/bin/evan"
+PIDFILE="/var/lock/evan"
+NAME="evan"
+DESC="evan daemons"
+TCONF="/etc/evan"
+
+test -f $DAEMON || exit 0
+
+[ -r /etc/default/evan ] && . /etc/default/evan
+
+
+start() {
+  [ -e $PIDFILE ] && echo "$PIDFILE already exists" && return 
+  $DAEMON $EXTRA -d "$@" &
+  echo $(($$+1)) > $PIDFILE #TODO fix this ugly hack!
+}
+stop() {
+  [ ! -e $PIDFILE ] && echo "$PIDFILE does not exist" && return
+  kill `cat $PIDFILE`
+  #killall evan
+  rm $PIDFILE
+}
+
+reload() {
+  echo "do nothing"
+  # do nothing
+}
+
+restart() {
+  stop "$@"
+  start "$@"
+}
+
+case "$1" in
+  start)
+    echo -n "Starting $DESC:" 
+    start
+  ;;
+  stop)
+    echo -n "Stopping $DESC:" 
+    stop
+  ;;
+  reload|force-reload)
+    echo -n "Reloading $DESC configuration:" 
+    reload
+  ;;
+  restart)
+    echo -n "Restarting $DESC:" 
+    restart
+  ;;
+  *)
+    echo "Usage: /etc/init.d/$NAME {start|stop|reload|restart|force-reload}"
+    exit 1
+  ;;
+esac
+echo "done"
+exit 0
diff --git a/evan/satz-liste b/evan/satz-liste
new file mode 100644
index 00000000..7586ea3b
--- /dev/null
+++ b/evan/satz-liste
@@ -0,0 +1,10 @@
+wenn ich meinen erzeugten abfall vor dem nach hause gehen beseitige steigt mein soziales ansehen
+bringe eine pflanze mit
+ein sauberer scheck ist ein guter scheck
+auch du weißt wie man den geschirrspüler einräumt
+wer die toilette putzt kommt in den himmel
+der große bruder sieht es gerne wenn die genossen die vereinsräume in stand halten
+henry der staubsauger saugt für dich
+muelltrennung bringt gutes karma
+saubere mitglieder sind glückliche mitglieder
+fnord
diff --git a/people/arping_users.py b/people/arping_users.py
index c576e4f3..008fe337 100755
--- a/people/arping_users.py
+++ b/people/arping_users.py
@@ -21,7 +21,7 @@ def load_names(MAC_NAMES):
   names = {}
   f = open(MAC_NAMES)
   for l in f:
-    mac,name = l.split()
+    mac,name = l.split(' ',1)
     names[mac] = name.replace('\n','')
   f.close()
   return names
@@ -29,7 +29,7 @@ def load_names(MAC_NAMES):
 def arping_helper(dic):
   return arpingy(**dic)
 
-for first in range(4):
+for first in range(1,3):
   for second in range(255):
     data.append({'iprange':'10.42.'+str(first)+'.'+str(second),'iface':DEV})
 
@@ -50,5 +50,3 @@ for p in ret:
     print p[0] + " => " + p[1]
   if p[1] in names:
     print names[p[1]]+ " is online"
-
-
diff --git a/people/mac_names.lst b/people/mac_names.lst
index dcd3c2b0..ae58b539 100644
--- a/people/mac_names.lst
+++ b/people/mac_names.lst
@@ -1 +1,7 @@
 00:40:63:c8:b5:a0 krebs
+00:23:54:29:1d:3e hadez
+00:26:c7:bd:a7:1a Martin
+04:1e:64:05:39:28 Stephan
+5c:59:48:22:2d:d2 Phil
+00:21:00:fb:5c:b6 Kah Hah
+00:1e:64:27:3b:72 Felix