* check if we can find the debian systems TZ setting.

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

diff --git a/webcit/debian/webcit.init b/webcit/debian/webcit.init
index 3e3521ba41f758cf7cfee67f7757c4f7e87a7590..ffceaa0d02d614da59fbbfe8294b78a9f8bf806d 100644 (file)
--- a/webcit/debian/webcit.init
+++ b/webcit/debian/webcit.init
@@ -53,6 +53,12 @@ if test -f $DEFAULT; then
   . $DEFAULT
 fi
 
+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 +67,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
@@ -81,7 +88,7 @@ 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
@@ -113,8 +120,8 @@ 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
+       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"
 
        if test -n "$MODERN"; then
            case "$?" in
@@ -149,7 +156,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 +170,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
        ;;
   *)