'Network User' is now 'Normal User'

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

diff --git a/citadel/debian/citadel.init b/citadel/debian/citadel.init
index 15dcdbf91039f8fdafc912c3921daa47cd9df25b..7fb213df9fc502c5c0587e28fe78c16ee251fd94 100644 (file)
--- a/citadel/debian/citadel.init
+++ b/citadel/debian/citadel.init
@@ -1,14 +1,18 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          citadel
-# Required-Start:    $local_fs $remote_fs
-# Required-Stop:     $local_fs $remote_fs
+# Required-Start:    $remote_fs $syslog
+# Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: control citadel server start at boot time
 # Description:       control citadel server start at boot time
 ### END INIT INFO
 
+# uncomment this to create coredumps as described in
+# http://www.citadel.org/doku.php/faq:mastering_your_os:gdb#how.do.i.make.my.system.produce.core-files
+# ulimit -c unlimited
+
 # Author: Wilfried Goesgens <citadel@outgesourced.org>
 
 RUNDIR=/var/run/citadel
@@ -17,12 +21,12 @@ DESC="Citadel Groupware "
 NAME=citserver
 DAEMON=/usr/sbin/$NAME
 PIDFILE=$RUNDIR/citadel.pid
-DAEMON_ARGS=" -d -x3 -lmail -t/dev/null"
+DAEMON_ARGS=" -d -lmail -t/dev/null"
 SCRIPTNAME=/etc/init.d/citadel
 SENDCOMMAND=/usr/sbin/sendcommand
 
 # Exit if the package is not installed
-[ -x "$DAEMON" ] || exit 0
+[ -x "$DAEMON" ] || { echo "$DAEMON not installed"; exit 1; }
 
 # Read configuration variable file if it is present
 [ -r /etc/default/$NAME ] && . /etc/default/$NAME
@@ -46,9 +50,10 @@ fi
 #
 do_start()
 {
-        # for ubuntu: check our volatile dirs.
+        # check our volatile dirs.
         if test ! -d $RUNDIR; then
            mkdir -p $RUNDIR
+           chmod go+rx $RUNDIR
        fi
        # Return
        #   0 if daemon has been started
@@ -67,39 +72,43 @@ do_start()
 #
 do_stop()
 {
-       # Return
-       #   0 if daemon has been stopped
-       #   1 if daemon was already stopped
-       #   2 if daemon could not be stopped
-       #   other if a failure occurred
-        if $SENDCOMMAND "DOWN" >/dev/null 2>&1 ; then
+       if test -S $RUNDIR/citadel.socket; then 
+           sendcommand "DOWN" || :
+       fi
+
+       PID=`cat $PIDFILE 2>/dev/null || :`
+       if [ ! -z $PID ]; then
            rm -f $PIDFILE
            count=0;
-           while test -S /var/run/citadel/citadel.socket; do 
+           while test -S /var/run/citadel/citadel.socket -o -d /proc/$PID; do 
                count=$(($count+1))
                sleep 1
                echo -n "."
                if test "$count" = "10"; then
-                   killall citserver
+                   kill $PID
                fi
                if test "$count" = "20"; then
-                   killall -9 citserver
+                   kill -9 $PID
                    rm -rf /var/run/citadel/*
                fi
            done
                return 0
-       else
-           rm -f $PIDFILE
-           return 2
        fi
+
+       return 0
 }
 
 #
 # Function that sends a SIGHUP to the daemon/service
 #
 do_reload() {
-        do_stop
-        do_start
+       # Return
+       #   0 if daemon could not be restarted
+       #   1 if daemon has been restarted
+       #   other if a failure occurred
+        if $SENDCOMMAND "DOWN 1" 2>&1|grep '200 Restarting'>/dev/null ; then
+           return 1
+       fi
        return 0
 }
 
@@ -127,40 +136,39 @@ case "$1" in
        fi
        do_stop
        if test -n "$MODERN"; then
-           case "$?" in
-               0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-               2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
-           esac
+               [ "$VERBOSE" != no ] && log_end_msg 0
        fi
        ;;
-  restart|force-reload)
+  restart)
+       $0 stop
+       $0 start
+       ;;
+  force-reload)
        if test -n "$MODERN"; then
            log_daemon_msg "Restarting $DESC" "$NAME"
        else
            echo "Restarting $DESC" "$NAME"
        fi
 
-       do_stop
+       do_reload
 
        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
+               0)
+                   log_end_msg 0
                    ;;
-               *)
+               1)
                # Failed to stop
                    log_end_msg 1
                    ;;
            esac
-       else
-           do_start
        fi
        ;;
+
+  status)
+       status_of_proc "$DAEMON" $NAME
+       ;;
+
   *)
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
        exit 3