* to much c-coding spoilz bash-sk1lz

[citadel.git] / citadel / debian / citadel.init

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index d821f1f4acc96ddcba425526a4bc14e4a5c80662..15dcdbf91039f8fdafc912c3921daa47cd9df25b 100644 (file)
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -16,8 +16,8 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Citadel Groupware "
 NAME=citserver
 DAEMON=/usr/sbin/$NAME
-PIDFILE=$RUNDIR/$NAME.pid
-DAEMON_ARGS=" -D${PIDFILE} -x3 -lmail -t/dev/null"
+PIDFILE=$RUNDIR/citadel.pid
+DAEMON_ARGS=" -d -x3 -lmail -t/dev/null"
 SCRIPTNAME=/etc/init.d/citadel
 SENDCOMMAND=/usr/sbin/sendcommand
 
@@ -74,10 +74,18 @@ do_stop()
        #   other if a failure occurred
         if $SENDCOMMAND "DOWN" >/dev/null 2>&1 ; then
            rm -f $PIDFILE
-
+           count=0;
            while test -S /var/run/citadel/citadel.socket; do 
+               count=$(($count+1))
                sleep 1
                echo -n "."
+               if test "$count" = "10"; then
+                   killall citserver
+               fi
+               if test "$count" = "20"; then
+                   killall -9 citserver
+                   rm -rf /var/run/citadel/*
+               fi
            done
                return 0
        else