* ok, we want the LANG feature. but now we make it dependant on WEBCIT_LANG instead...

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

diff --git a/webcit/debian/webcit.init b/webcit/debian/webcit.init
index a9b0f1b9576dc4f04322a70108bcbe0ad327d47e..f867e8ad71828111782c19ddbc6d5ec31aada485 100644 (file)
--- a/webcit/debian/webcit.init
+++ b/webcit/debian/webcit.init
@@ -14,7 +14,7 @@
 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
@@ -24,10 +24,6 @@ DEFAULT=/etc/default/webcit
 LOGDIR=/var/log/webcit/
 
 
-unset LANG
-unset LANGUAGE
-unset LC_ALL
-unset LOCALE
 # Exit if the package is not installed
 [ -x "$DAEMON" ] || exit 0
 
@@ -53,6 +49,18 @@ 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,6 +69,7 @@ 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
@@ -71,8 +80,6 @@ do_start()
            mkdir -p $LOGDIR
        fi
 
-
-
        # are we disabled?
        if test "$1" -lt "0"; then
            return 0
@@ -83,14 +90,11 @@ do_start()
        #   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
+           -p$@ -t$LOGDIR/access.${1}.log $4; 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.
 }
 
 #
@@ -98,47 +102,13 @@ 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
-
         for i in $PIDFILE.*; do if test -f $i; then
            kill `cat $i`
            rm -f $i
        fi; done
-
-       #while test -d /proc/`cat $PIDFILE`; do
-       #    /usr/bin/printf  '.'
-       #    /bin/sleep 1
-       #done
- 
-       #start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME
-       #RETVAL="$?"
-       #[ "$RETVAL" = 2 ] && return 2
-       # Wait for children to finish too if this is a daemon that forks
-       # and if the daemon is only ever run from this initscript.
-       # If the above conditions are not satisfied then add some other code
-       # that waits for the process to drop all resources that could be
-       # needed by services started subsequently.  A last resort is to
-       # sleep for some time.
-       #start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
-       #[ "$?" = 2 ] && return 2
-       # Many daemons don't delete their pidfiles when they exit.
-       # rm -f $PIDFILE
 }
 
-#
-# Function that sends a SIGHUP to the daemon/service
-#
 do_reload() {
-       #
-       # If the daemon can reload its configuration without
-       # restarting (for example, when it is sent a SIGHUP),
-       # then implement that here.
-       #
-#      start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
         do_stop
         do_start
        return 0
@@ -152,8 +122,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
@@ -176,20 +150,7 @@ case "$1" in
            esac
        fi
        ;;
-  #reload|force-reload)
-       #
-       # If do_reload() is not implemented then leave this commented out
-       # and leave 'force-reload' as an alias for 'restart'.
-       #
-       #log_daemon_msg "Reloading $DESC" "$NAME"
-       #do_reload
-       #log_end_msg $?
-       #;;
   restart|force-reload)
-       #
-       # If the "reload" option is implemented then remove the
-       # 'force-reload' alias
-       #
        if test -n "$MODERN"; then
        log_daemon_msg "Restarting $DESC" "$NAME"
        else
@@ -201,7 +162,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
@@ -213,10 +175,12 @@ case "$1" in
                    log_end_msg 1
                    ;;
            esac
+       else
+           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
        ;;
   *)
-       #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
        echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
        exit 3
        ;;