X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fdebian%2Fcitadel-webcit.config;h=21158acbcdc7f752f0792615b2258d557600b993;hb=d337527fdb58a5496428babc0d68736ada0d4c0e;hp=534572addfaad13f33a11c254227e413ad12b537;hpb=15aac7b56216455e69a98222e06dcbfa8407fd73;p=citadel.git

diff --git a/webcit/debian/citadel-webcit.config b/webcit/debian/citadel-webcit.config
index 534572add..21158acbc 100755
--- a/webcit/debian/citadel-webcit.config
+++ b/webcit/debian/citadel-webcit.config
@@ -2,67 +2,70 @@
 set -e
 . /usr/share/debconf/confmodule
 
-CONFIGURE=no
-
-if test -e /etc/default/webcit; then
-  source /etc/default/webcit
-else
-   CONFIGURE=yes
-    export WEBCIT_CITADEL_IP=127.0.0.1
-    export WEBCIT_CITADEL_PORT=504
-fi
+db_version 2.0
 
 db_capb backup 
 
-
-# are we unconfigured?
-db_get ciatdel/WebcitWebserver &&WWWTYPE="$RET"
-if test -z "$WWWTYPE"; then 
-   CONFIGURE=yes
-fi;
+DO_CONFIGURE=no
 
 if test -n "$2"; then
 # do we want to reconfigure?
-    if test "`echo $2 | sed -e 's/[.-]//g'`" -lt 127 \
-	-o $1 = reconfigure
-	then
-	CONFIGURE=yes
+    if test "$1" = reconfigure; then
+	DO_CONFIGURE=yes
     fi
 else 
 # are we in first install?
     if test "$1" = "configure"; then
-	CONFIGURE=yes
+	DO_CONFIGURE=yes
     fi
 fi
 
-if test "$CONFIGURE" = "yes"; then
-    STATE=1
-    LASTSTATE=2
-    while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
+if test "$DO_CONFIGURE" = "yes"; then
+	if test -e /etc/default/webcit; then
+		. /etc/default/webcit
+	else
+		WEBCIT_APACHEFLAG=" "
+		WEBCIT_HTTP_PORT=8504
+		WEBCIT_HTTPS_PORT=-1
+		WEBCIT_LANG=UNLIMITED
+	fi
+		
+	if test "$WEBCIT_APACHEFLAG" = "-f"; then
+		db_set citadel/WebcitApacheIntegration Apache2
+	else
+		db_set citadel/WebcitApacheIntegration Internal
+	fi
+	db_set citadel/WebcitHttpPort $WEBCIT_HTTP_PORT
+	db_set citadel/WebcitHttpsPort $WEBCIT_HTTPS_PORT
+	db_set citadel/WebcitOfferLang $WEBCIT_LANG
+
+	STATE=1
+	LASTSTATE=5
+	while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
+
 	case "$STATE" in
 	    1)
-		db_input high citadel/WebcitApacheIntegration
+		db_input high citadel/WebcitApacheIntegration || true
 		;;
 	    2)
 		db_get citadel/WebcitApacheIntegration
 		if test "$RET" = "Internal"; then
-		    db_input high citadel/WebcitHttpPort
-		else
-		    db_set citadel/WebcitHttpPort 8504
+		    db_set citadel/WebcitHttpPort 80
+		    db_input high citadel/WebcitHttpPort || true
 		fi
 		;;
-	    3)		     
+	    3)
 		db_get citadel/WebcitApacheIntegration
 		if test "$RET" = "Internal"; then
-		    db_input high citadel/WebcitHttpsPort
-		    db_set citadel/WebcitBindIp 0.0.0.0
-		else
-		    db_set citadel/WebcitHttpsPort -1
-		    db_set citadel/WebcitBindIp 127.0.0.1
+		    db_set citadel/WebcitHttpsPort 443
+		    db_input high citadel/WebcitHttpsPort || true
 		fi
 		;;
 	    4)
-		db_input high citadel/WebcitInstallnote
+		db_input high citadel/WebcitOfferLang || true
+		;;
+	    5)
+		db_input high citadel/WebcitInstallnote||true
 		;;
 	esac
 	if db_go; then
@@ -70,17 +73,9 @@ if test "$CONFIGURE" = "yes"; then
 	else
 	    STATE=$(($STATE - 1))
 	fi
-	
-    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"
-    
+
+	done
     set |grep WEBCIT |sed "s;^;export ;;" >/etc/default/webcit
 fi
 
-
-
 exit 0