gv doku protokoll

[svn42.git] / tuer_status.initscript

diff --git a/tuer_status.initscript b/tuer_status.initscript
old mode 100644 (file)
new mode 100755 (executable)
index bad4806..d4cd7ff
--- a/tuer_status.initscript
+++ b/tuer_status.initscript
@@ -3,30 +3,37 @@
 #
 ### 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_UWEB=/flash/tuer/update-web-status.py
-EXE_XMPP=/flash/tuer/update-xmpp-status.py
-
-CFG_UWEB=/flash/tuer/update-web-status.cfg
-CFG_XMPP=/flash/tuer/update-xmpp-status.cfg
+EXE_UWEB=/flash/tuer/r3-netstatus
+STATE_DIR=/flash/var/lib/r3netstatus/
+CFG_UWEB=""
 
 . /etc/default/tuer
 
-PIDFILE_UWEB=${DIR_RUN}/update-web-status.pid
-PIDFILE_XMPP=${DIR_RUN}/update-xmpp-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"
+[ -n "$PRESENCE_SOCKET" ] && CFG_UWEB="$CFG_UWEB --presencesocket $PRESENCE_SOCKET"
+
+
+PIDFILE_UWEB=${DIR_RUN}/r3-netstatus.pid
 
 test -f $EXE_UWEB  || exit 1
-test -f $EXE_XMPP  || 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
@@ -36,19 +43,13 @@ fi
 case "$1" in
 start) 
        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  -- $DOOR_SOCKET $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  -- $DOOR_SOCKET $CFG_XMPP
+        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 $? 
         ;;
 restart) 
        $0 stop