Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

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

diff --git a/webcit/debian/webcit.init b/webcit/debian/webcit.init
index b99e24ca3c43ae157702675015618efbeabe86b7..2375ac7122df840b38b05b16a5a085a39c3f49e7 100644 (file)
--- a/webcit/debian/webcit.init
+++ b/webcit/debian/webcit.init
@@ -25,7 +25,6 @@ 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`
 
 # Exit if the package is not installed
@@ -79,10 +78,6 @@ do_start()
            mkdir -p $RUNDIR
        fi
 
-        if test ! -d $LOGDIR; then
-           mkdir -p $LOGDIR
-       fi
-
        # are we disabled?
        if test "$1" -lt "0"; then
            return 0
@@ -93,7 +88,7 @@ do_start()
        #   1 if daemon was already running
        #   2 if daemon could not be started
        if $DAEMON -u $DROP_TO_UID -D$PIDFILE.$1 \
-           -p$@ -t$LOGDIR/access.${1}.log $4; then
+           -p$@ $4; then
            return 0
        else
            return 2