added tuerctl shell

[svn42.git] / tuer.initscript

diff --git a/tuer.initscript b/tuer.initscript
index 398df44..a07edf0 100755 (executable)
--- a/tuer.initscript
+++ b/tuer.initscript
@@ -12,8 +12,12 @@
 EXE_DOOR=/flash/tuer/door_daemon
 EXE_CARD=/flash/tuer/checkcard.pl
 EXE_UWEB=/flash/tuer/update-web-status.py
+EXE_XMPP=/flash/tuer/update-xmpp-status.py
 DIR_RUN=/var/run/tuer
 
+CFG_UWEB=/flash/tuer/update-web-status.cfg
+CFG_XMPP=/flash/tuer/update-xmpp-status.cfg
+
 DOOR_SOCKET=${DIR_RUN}/door_cmd.socket
 DOOR_DEV=/dev/door
 DOOR_LOG="--log syslog:3,door_daemon,local1"
@@ -23,7 +27,8 @@ DOOR_GRP=nogroup
 
 PIDFILE1=${DIR_RUN}/door_daemon.pid
 PIDFILE2=${DIR_RUN}/checkcard.pid
-PIDFILE3=${DIR_RUN}/update_web_status.pid
+PIDFILE3=${DIR_RUN}/update-web-status.pid
+PIDFILE4=${DIR_RUN}/update-xmpp-status.pid
 
 test -f $EXE_DOOR  || exit 1
 test -f $EXE_CARD  || exit 1
@@ -49,7 +54,10 @@ start)
         #start-stop-daemon --start --quiet --pidfile $PIDFILE2 -c $DOOR_USR -b -m --name checkcard.pl --startas $EXE_CARD  -- $DOOR_SOCKET
         log_end_msg $? 
        log_daemon_msg "Starting door daemon" "update-web-status"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE3 -b -m -c $DOOR_USR --name update-web-status.py --startas $EXE_UWEB  -- $DOOR_SOCKET
+        start-stop-daemon --start --quiet --pidfile $PIDFILE3 -b -m -c $DOOR_USR --name update-web-status.py --startas $EXE_UWEB  -- $DOOR_SOCKET $CFG_UWEB
+        log_end_msg $? 
+       log_daemon_msg "Starting door daemon" "update-xmpp-status"
+        start-stop-daemon --start --quiet --pidfile $PIDFILE4 -b -m -c $DOOR_USR --name update-xmpp-status.py --startas $EXE_XMPP  -- $DOOR_SOCKET $CFG_XMPP
         log_end_msg $? 
        ;;
 stop)
@@ -60,7 +68,10 @@ stop)
         start-stop-daemon --stop --quiet --pidfile $PIDFILE2 -m --name checkcard.pl
         log_end_msg $? 
        log_daemon_msg "Stopping door daemon" "update-web-status"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE3 -m --name update_web_status.py
+        start-stop-daemon --stop --quiet --pidfile $PIDFILE3 -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 $PIDFILE4 -m --retry TERM/1/TERM/1/KILL 
         log_end_msg $? 
        killall "mifare-read" 2>/dev/null
         ;;