From d24264c71228282773d7a2850d13383c8299fb00 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Thu, 7 Jun 2007 09:59:42 +0000
Subject: [PATCH] * added some missing depends * evaluate wether we are in
 apache mode, and append -f

---
 webcit/debian/citadel-webcit.config | 8 +++++++-
 webcit/debian/control               | 4 ++--
 webcit/debian/webcit.init           | 7 ++++---
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/webcit/debian/citadel-webcit.config b/webcit/debian/citadel-webcit.config
index c8c58bd50..ab2fe81e5 100755
--- a/webcit/debian/citadel-webcit.config
+++ b/webcit/debian/citadel-webcit.config
@@ -70,11 +70,17 @@ if test "$DO_CONFIGURE" = "yes"; then
 	
     done
     db_go
-    db_get ciatdel/WebcitWebserver &&WWWTYPE="$RET"
     db_get citadel/WebcitHttpPort && WEBCIT_HTTP_PORT="$RET"
     db_get citadel/WebcitHttpsPort && WEBCIT_HTTPS_PORT="$RET"
     db_get citadel/WebcitBindIp && WEBCIT_LISTEN_IP="$RET"
     
+    db_get ciatdel/WebcitWebserver &&WWWTYPE="$RET"
+    if test "$WWWTYPE" = "Internal"; then
+	WEBCIT_APACHEFLAG=" "
+    else
+	WEBCIT_APACHEFLAG="-f"
+    fi
+
     set |grep WEBCIT |sed "s;^;export ;;" >/etc/default/webcit
 fi
 
diff --git a/webcit/debian/control b/webcit/debian/control
index 0a2b162ca..e108f8269 100644
--- a/webcit/debian/control
+++ b/webcit/debian/control
@@ -2,12 +2,12 @@ Source: webcit
 Section: web
 Priority: optional
 Maintainer: Wilfried Goesgens <w.goesgens@outgesourced.org>
-Build-Depends: debhelper (>= 4), po-debconf, libical-dev, gettext
+Build-Depends: debhelper (>= 4), po-debconf, libical-dev, gettext, locales, localepurge
 Standards-Version: 3.7.2
 
 Package: citadel-webcit
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, tinymce, citadel-common
+Depends: ${shlibs:Depends}, ${misc:Depends}, debconf, tinymce, citadel-common, openssl, locales, localepurge
 Suggests: citadel-server, apache2 | apache
 Description: web-based frontend to Citadel groupware server
  WebCit is a web-based, AJAX-enabled frontend to the Citadel groupware system.
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
-- 
2.30.2