X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdebian%2Fwebcit.init;h=9f91937fa6dc5f783fffd5e0fc5cefd12a3b0fae;hb=d24264c71228282773d7a2850d13383c8299fb00;hp=3e3521ba41f758cf7cfee67f7757c4f7e87a7590;hpb=db31c40bccb5ee32bef0ef6f1b348a66fbdf061e;p=citadel.git diff --git a/webcit/debian/webcit.init b/webcit/debian/webcit.init index 3e3521ba4..9f91937fa 100644 --- a/webcit/debian/webcit.init +++ b/webcit/debian/webcit.init @@ -61,6 +61,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 +82,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 +114,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