* purge ctdlsvc.c

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

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index e38b0163febb126334def5e3f6d48f1575c10b8e..3343b0f06b6bbd352b791bb7127552f72fda5007 100644 (file)
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -23,7 +23,7 @@ PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Citadel Groupware "
 NAME=citserver
 DAEMON=/usr/sbin/$NAME
-DAEMON_ARGS=" -d -x3 -lmail"
+DAEMON_ARGS=" -d -x3 -lmail -t/dev/null"
 PIDFILE=$RUNDIR/$NAME.pid
 SCRIPTNAME=/etc/init.d/citadel
 SENDCOMMAND=/usr/sbin/sendcommand
@@ -35,12 +35,19 @@ SENDCOMMAND=/usr/sbin/sendcommand
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
 
-# Load the VERBOSE setting and other rcS variables
-. /lib/init/vars.sh
+MODERN=
 
+# Load the VERBOSE setting and other rcS variables
+if test -f /lib/init/vars.sh ; then
+    . /lib/init/vars.sh
+    MODERN=1
+fi
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
-. /lib/lsb/init-functions
+if test -f /lib/lsb/init-functions; then
+    . /lib/lsb/init-functions
+    MODERN=1
+fi
 
 #
 # Function that starts the daemon/service
@@ -55,9 +62,12 @@ do_start()
        #   0 if daemon has been started
        #   1 if daemon was already running
        #   2 if daemon could not be started
-       start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
-               $DAEMON_ARGS \
-               || return 2
+       if $DAEMON \
+               $DAEMON_ARGS ; then
+           return 0
+       else
+           return 2
+       fi
        # Add code here, if necessary, that waits for the process to be ready
        # to handle requests from services started subsequently which depend
        # on this one.  As a last resort, sleep for some time.
@@ -73,13 +83,23 @@ do_stop()
        #   1 if daemon was already stopped
        #   2 if daemon could not be stopped
        #   other if a failure occurred
-        %SENDCOMMAND "DOWN"
+        if $SENDCOMMAND "DOWN" >/dev/null 2>&1 ; then
+           rm -f $PIDFILE
+
+           while test -S /var/run/citadel/citadel.socket; do 
+               sleep 1
+               echo -n "."
+           done
+               return 0
+       else
+           rm -f $PIDFILE
+           return 2
+       fi
 
        #while test -d /proc/`cat $PIDFILE`; do
        #    /usr/bin/printf  '.'
        #    /bin/sleep 1
        #done
-        sleep 5
  
        #start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
        #RETVAL="$?"
@@ -94,7 +114,6 @@ do_stop()
        #[ "$?" = 2 ] && return 2
        # Many daemons don't delete their pidfiles when they exit.
        # rm -f $PIDFILE
-       return 0
 }
 
 #
@@ -114,20 +133,33 @@ do_reload() {
 
 case "$1" in
   start)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+       if test -n "$MODERN"; then
+           [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+       else
+           echo "Starting $DESC" "$NAME"
+       fi
+
        do_start
-       case "$?" in
+       if test -n "$MODERN"; then
+           case "$?" in
                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-       esac
+           esac
+       fi
        ;;
   stop)
-       [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+       if test -n "$MODERN"; then
+           [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+       else
+           echo "Stopping $DESC" "$NAME"
+       fi
        do_stop
-       case "$?" in
+       if test -n "$MODERN"; then
+           case "$?" in
                0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
                2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-       esac
+           esac
+       fi
        ;;
   #reload|force-reload)
        #
@@ -143,22 +175,30 @@ case "$1" in
        # If the "reload" option is implemented then remove the
        # 'force-reload' alias
        #
-       log_daemon_msg "Restarting $DESC" "$NAME"
+       if test -n "$MODERN"; then
+           log_daemon_msg "Restarting $DESC" "$NAME"
+       else
+           echo "Restarting $DESC" "$NAME"
+       fi
+
        do_stop
-       case "$?" in
-         0|1)
-               do_start
-               case "$?" in
+
+       if test -n "$MODERN"; then
+           case "$?" in
+               0|1)
+                   do_start
+                   case "$?" in
                        0) log_end_msg 0 ;;
                        1) log_end_msg 1 ;; # Old process is still running
                        *) log_end_msg 1 ;; # Failed to start
-               esac
-               ;;
-         *)
+                   esac
+                   ;;
+               *)
                # Failed to stop
-               log_end_msg 1
-               ;;
-       esac
+                   log_end_msg 1
+                   ;;
+           esac
+       fi
        ;;
   *)
        #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2