X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=tuer_core.initscript;h=ed3902d9c54093810014f489a4c493280b5094a4;hb=d485a5691846998897c4f8b916a09ad783de5289;hp=b2d875ac749e6253cb0b38bb24fcf0de394d4e01;hpb=81b5523c85aba9f8d62749deba3c968861106f37;p=svn42.git

diff --git a/tuer_core.initscript b/tuer_core.initscript
index b2d875a..ed3902d 100755
--- a/tuer_core.initscript
+++ b/tuer_core.initscript
@@ -9,19 +9,14 @@
 # Default-Stop:      0 1 6
 ### END INIT INFO
 
-EXE_DOOR=/flash/tuer/door_daemon
-EXE_CARD=/flash/tuer/checkcard.pl
-
-DOOR_LOG="--log syslog:3,door_daemon,local1"
+EXE_DOOR=/flash/tuer/door_daemon_zmq
 DOOR_DEV=/dev/door
 
 . /etc/default/tuer
 
 PIDFILE_DOOR=${DIR_RUN}/door_daemon.pid
-PIDFILE_CARD=${DIR_RUN}/checkcard.pid
 
-test -f $EXE_DOOR  || exit 1
-test -f $EXE_CARD  || exit 1
+test -e $EXE_DOOR  || exit 1
 if [ ! -d $DIR_RUN ]; then
 	mkdir -p $DIR_RUN || exit 2
 	chown -R $DOOR_USR:$DOOR_GRP $DIR_RUN
@@ -35,25 +30,17 @@ chown $DOOR_USR:$DOOR_GRP $DOOR_DEV
 # and tasks running under it.
 
 case "$1" in
-start)	
-	log_daemon_msg "Starting door daemon" "door_daemon"
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_DOOR --name door_daemon --startas $EXE_DOOR -- -d $DOOR_DEV -s $DOOR_SOCKET -u $DOOR_USR -g $DOOR_GRP -P $PIDFILE_DOOR $DOOR_LOG
-        log_end_msg $?
-	log_daemon_msg "Starting door daemon" "checkcard"
-        #start-stop-daemon --start --quiet --pidfile $PIDFILE_CARD -b -m --name checkcard.pl --startas $EXE_CARD  -- $DOOR_SOCKET
-        start-stop-daemon --start --quiet --pidfile $PIDFILE_CARD -c $DOOR_USR -b -m --name checkcard.pl --startas $EXE_CARD  -- $DOOR_SOCKET
-        log_end_msg $?	
-	;;
+start)
+  log_daemon_msg "Starting door daemon" "door_daemon_zmq"
+  start-stop-daemon --start --quiet --pidfile $PIDFILE_DOOR -c $DOOR_USR -m -g $DOOR_GRP -b --name door_daemon_zmq --startas $EXE_DOOR -- --device $DOOR_DEV --cmdport "$DOOR_SOCKET" --syslog
+  log_end_msg $?
+  ;;
 stop)
-	log_daemon_msg "Stopping door daemon" "door_daemon"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE_DOOR -m --name door_daemon 
-        log_end_msg $?
-	log_daemon_msg "Stopping door daemon" "checkcard"
-        start-stop-daemon --stop --quiet --pidfile $PIDFILE_CARD -m --name checkcard.pl
-        log_end_msg $?	
-	killall "mifare-read" 2>/dev/null
+  log_daemon_msg "Stopping door daemon" "door_daemon_zmq"
+  start-stop-daemon --stop --quiet --pidfile $PIDFILE_DOOR -m --name door_daemon_zmq
+  log_end_msg $?
         ;;
-restart) 
+restart)
 	$0 stop
 	$0 start
         ;;