sensorgauges

[svn42.git] / tuer_status.initscript

diff --git a/tuer_status.initscript b/tuer_status.initscript
index d4cd7ff..bc465cd 100755 (executable)
--- a/tuer_status.initscript
+++ b/tuer_status.initscript
@@ -11,14 +11,13 @@
 
 EXE_UWEB=/flash/tuer/r3-netstatus
 STATE_DIR=/flash/var/lib/r3netstatus/
-CFG_UWEB=""
+CFG_UWEB="-syslog"
 
 . /etc/default/tuer
 
 [ -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
@@ -41,17 +40,17 @@ fi
 # and tasks running under it.
 
 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 --startas $EXE_UWEB  -- $CFG_UWEB
-        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 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
         ;;