X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=tuer_status.initscript;fp=tuer_status.initscript;h=d4cd7ff5985861afaca0b3efd88289ed17face77;hb=3532254fdc34a8649a2894e8e746a4bf61947bde;hp=f90d2eb81554f70cdcd4fc9336ad4f2cbdc192f1;hpb=6f78aae1eac804c1049def612920f9ddf9e189c8;p=svn42.git

diff --git a/tuer_status.initscript b/tuer_status.initscript
index f90d2eb..d4cd7ff 100755
--- a/tuer_status.initscript
+++ b/tuer_status.initscript
@@ -9,24 +9,31 @@
 # 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
@@ -38,17 +45,11 @@ 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 $?	
-	log_daemon_msg "Starting door daemon" "update-xmpp-status"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_XMPP -b -m -c $DOOR_USR --startas $EXE_XMPP  -- $CFG_XMPP
-        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