X-Git-Url: https://git.realraum.at/?p=svn42.git;a=blobdiff_plain;f=tuer_status.initscript;h=bc465cd82cedb137e39e454e2bc878144c19f7b8;hp=8bc4821d4086de6f1d8ba615b597da5c5ad0c6d9;hb=9148b190d80a15e5393f7ef8c5bd6997c4b40bb2;hpb=afb9a794cf6c52dd7ab07de3f147d17aee06f9d8

diff --git a/tuer_status.initscript b/tuer_status.initscript
index 8bc4821..bc465cd 100755
--- a/tuer_status.initscript
+++ b/tuer_status.initscript
@@ -3,42 +3,36 @@
 #
 ### BEGIN INIT INFO
 # Provides:          tuer_status
-# Required-Start:    $remote_fs $syslog $time $tuer_core
-# Required-Stop:     $remote_fs $syslog $time $tuer_core
+# Required-Start:    $remote_fs $syslog $time tuer_core tuer_presence
+# Required-Stop:     $remote_fs $syslog $time tuer_core tuer_presence
 # Default-Start:     2 3 4 5
-# Default-Stop:      1
+# Default-Stop:      0 1 6
 ### END INIT INFO
 
-EXE_TRACK=/flash/tuer/track-presence.py
-EXE_UWEB=/flash/tuer/update-web-status.py
-EXE_XMPP=/flash/tuer/update-xmpp-status.py
-EXE_SWITCH=/flash/tuer/switch-power.py
-EXE_SOUND=/flash/tuer/play-sound-status.py
-
-CFG_TRACK=/flash/tuer/track-presence.cfg
-CFG_UWEB=/flash/tuer/update-web-status.cfg
-CFG_XMPP=/flash/tuer/update-xmpp-status.cfg
-CFG_SWITCH=/flash/tuer/switch-power.cfg
-CFG_SOUND=/flash/tuer/play-sound-status.cfg
+EXE_UWEB=/flash/tuer/r3-netstatus
+STATE_DIR=/flash/var/lib/r3netstatus/
+CFG_UWEB="-syslog"
 
 . /etc/default/tuer
 
-PIDFILE_TRACK=${DIR_RUN}/track-presence.pid
-PIDFILE_UWEB=${DIR_RUN}/update-web-status.pid
-PIDFILE_XMPP=${DIR_RUN}/update-xmpp-status.pid
-PIDFILE_SWITCH=${DIR_RUN}/switch-power.pid
-PIDFILE_SOUND=${DIR_RUN}/play-sound-status.pid
+[ -n "$XMPPJID" ] && CFG_UWEB="$CFG_UWEB --xjid $XMPPJID"
+[ -n "$XMPPPASS" ] && CFG_UWEB="$CFG_UWEB --xpass $XMPPPASS"
+[ -n "$XMPPBOTAUTH" ] && CFG_UWEB="$CFG_UWEB --xbotauth $XMPPBOTAUTH"
+
+
+PIDFILE_UWEB=${DIR_RUN}/r3-netstatus.pid
 
-test -f $EXE_TRACK  || exit 1
 test -f $EXE_UWEB  || exit 1
-test -f $EXE_XMPP  || exit 1
-test -f $EXE_SWITCH  || exit 1
-test -f $EXE_SOUND  || exit 1
 if [ ! -d $DIR_RUN ]; then
 	mkdir -p $DIR_RUN || exit 2
 	chown -R $DOOR_USR:$DOOR_GRP $DIR_RUN
 fi
 
+if [ ! -d $STATE_DIR ]; then
+	mkdir -p $STATE_DIR || exit 2
+	chown -R $DOOR_USR:$DOOR_GRP $STATE_DIR
+fi
+
 . /lib/lsb/init-functions
 
 # Read the system's locale and set cron's locale. This locale
@@ -46,41 +40,17 @@ fi
 # and tasks running under it.
 
 case "$1" in
-start)	
-	log_daemon_msg "Starting door daemon" "track-presence"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_TRACK -b -m -c $DOOR_USR --name track-presence.py --startas $EXE_TRACK  -- $CFG_TRACK
-        log_end_msg $?	
-	log_daemon_msg "Starting door daemon" "update-web-status"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_UWEB -b -m -c $DOOR_USR --name update-web-status.py --startas $EXE_UWEB  -- $CFG_UWEB
-        log_end_msg $?	
-	log_daemon_msg "Starting door daemon" "update-xmpp-status"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_XMPP -b -m -c $DOOR_USR --name update-xmpp-status.py --startas $EXE_XMPP  -- $CFG_XMPP
-        log_end_msg $?	
-	log_daemon_msg "Starting door daemon" "switch-power"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_SWITCH -b -m -c $DOOR_USR --name update-xmpp-status.py --startas $EXE_SWITCH  -- $CFG_SWITCH
-        log_end_msg $?	
-	log_daemon_msg "Starting door daemon" "play-sound"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_SOUND -b -m -c $DOOR_USR --name update-xmpp-status.py --startas $EXE_SOUND  -- $CFG_SOUND
-        log_end_msg $?	
+start)
+  log_daemon_msg "Starting xmpp and web status daemon" r3-netstatus
+  start-stop-daemon --start --quiet --pidfile $PIDFILE_UWEB -b -m -c $DOOR_USR --startas $EXE_UWEB  -- $CFG_UWEB
+  log_end_msg $?
 	;;
 stop)
-	log_daemon_msg "Stopping door daemon" "update-web-status"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE_UWEB -m --retry TERM/1/TERM/1/KILL 
-        log_end_msg $?	
-	log_daemon_msg "Stopping door daemon" "update-xmpp-status"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE_XMPP -m --retry TERM/1/TERM/1/KILL 
-        log_end_msg $?	
-	log_daemon_msg "Stopping door daemon" "switch-power"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE_SWITCH -m --retry TERM/1/TERM/1/KILL 
-        log_end_msg $?	
-	log_daemon_msg "Stopping door daemon" "play-sound"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE_SOUND -m --retry TERM/1/TERM/1/KILL 
-        log_end_msg $?	
-	log_daemon_msg "Stopping door daemon" "track-presence"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE_TRACK -m --retry TERM/1/TERM/1/KILL 
-        log_end_msg $?	
+  log_daemon_msg "Stopping xmpp and web status daemon" r3-netstatus
+  start-stop-daemon --stop --quiet --pidfile $PIDFILE_UWEB -m --retry TERM/1/TERM/1/KILL
+  log_end_msg $?
         ;;
-restart) 
+restart)
 	$0 stop
 	$0 start
         ;;