by Harry Coin: remove deprecated -t option from the debian init script.

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

diff --git a/webcit/debian/webcit.init b/webcit/debian/webcit.init
index 3e3521ba41f758cf7cfee67f7757c4f7e87a7590..2375ac7122df840b38b05b16a5a085a39c3f49e7 100644 (file)
--- a/webcit/debian/webcit.init
+++ b/webcit/debian/webcit.init
@@ -10,24 +10,23 @@
 #                    placed in /etc/init.d.
 ### 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/webcit
 PATH=/sbin:/usr/sbin:/bin:/usr/bin
 DESC="Citadel Groupware Webserver "
-NAME=webserver
+NAME=webcit
 DAEMON=/usr/sbin/$NAME
 DAEMON_ARGS=""
 PIDFILE=$RUNDIR/$NAME.pid
 SCRIPTNAME=/etc/init.d/webcit
 SENDCOMMAND=/usr/sbin/sendcommand
 DEFAULT=/etc/default/webcit
-LOGDIR=/var/log/webcit/
-
+DROP_TO_UID=`id -u nobody`
 
-unset LANG
-unset LANGUAGE
-unset LC_ALL
-unset LOCALE
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
@@ -53,6 +52,17 @@ if test -f $DEFAULT; then
   . $DEFAULT
 fi
 
+unset LANG
+unset LANGUAGE
+unset LC_ALL
+unset LOCALE
+
+if test -z "$TZ"; then
+       if test -e /etc/timezone; then
+               TZ=`cat /etc/timezone`
+               export TZ
+       fi
+fi
 #
 # Function that starts the daemon/service
 #
@@ -61,16 +71,13 @@ do_start()
     #1: -p flag
     #1: port
     #2: ssl
+    #4: -f flag for apache
 
         # for ubuntu: check our volatile dirs.
         if test ! -d $RUNDIR; then
            mkdir -p $RUNDIR
        fi
 
-        if test ! -d $LOGDIR; then
-           mkdir -p $LOGDIR
-       fi
-
        # are we disabled?
        if test "$1" -lt "0"; then
            return 0
@@ -80,8 +87,8 @@ do_start()
        #   0 if daemon has been started
        #   1 if daemon was already running
        #   2 if daemon could not be started
-       if $DAEMON -D$PIDFILE.$1 \
-           -p$@ -t$LOGDIR/access.${1}.log ; then
+       if $DAEMON -u $DROP_TO_UID -D$PIDFILE.$1 \
+           -p$@ $4; then
            return 0
        else
            return 2
@@ -101,7 +108,8 @@ do_stop()
 
 do_reload() {
         do_stop
-        do_start
+       do_start $WEBCIT_HTTP_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT "" "$LISTEN"  "$WEBCIT_APACHEFLAG"
+       do_start $WEBCIT_HTTPS_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT -s "$LISTEN"  "$WEBCIT_APACHEFLAG"
        return 0
 }
 
@@ -113,8 +121,12 @@ case "$1" in
            echo "Starting $DESC" "$NAME"
        fi
 
-       do_start $WEBCIT_HTTP_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT
-       do_start $WEBCIT_HTTPS_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT -s
+       if test -n "$WEBCIT_LISTEN_IP"; then
+           LISTEN="-i$WEBCIT_LISTEN_IP"
+       fi
+
+       do_start $WEBCIT_HTTP_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT "" "$LISTEN"  "$WEBCIT_APACHEFLAG"
+       do_start $WEBCIT_HTTPS_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT -s "$LISTEN"  "$WEBCIT_APACHEFLAG"
 
        if test -n "$MODERN"; then
            case "$?" in
@@ -149,7 +161,8 @@ case "$1" in
        if test -n "$MODERN"; then
            case "$?" in
                0|1)
-                   do_start
+                   do_start $WEBCIT_HTTP_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT "" "$WEBCIT_APACHEFLAG"
+                   do_start $WEBCIT_HTTPS_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT -s  "$WEBCIT_APACHEFLAG"
                    case "$?" in
                        0) log_end_msg 0 ;;
                        1) log_end_msg 1 ;; # Old process is still running
@@ -162,7 +175,8 @@ case "$1" in
                    ;;
            esac
        else
-           do_start
+           do_start $WEBCIT_HTTP_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT "" "$WEBCIT_APACHEFLAG"
+           do_start $WEBCIT_HTTPS_PORT $WEBCIT_CITADEL_IP $WEBCIT_CITADEL_PORT -s  "$WEBCIT_APACHEFLAG"
        fi
        ;;
   *)