* resynced some functionality with pkg-citadel

[citadel.git] / webcit / debian / citadel-webcit.config

diff --git a/webcit/debian/citadel-webcit.config b/webcit/debian/citadel-webcit.config
index 534572addfaad13f33a11c254227e413ad12b537..b266d2cb6d44527b18876633a4736d4eab56696d 100755 (executable)
--- a/webcit/debian/citadel-webcit.config
+++ b/webcit/debian/citadel-webcit.config
@@ -2,67 +2,66 @@
 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
+       -o "$1" = reconfigure
        then
-       CONFIGURE=yes
+       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
+if test "$DO_CONFIGURE" = "yes"; then
+    if test -e /etc/default/webcit; then
+       . /etc/default/webcit
+    else
+       export WEBCIT_CITADEL_IP=127.0.0.1
+       export WEBCIT_CITADEL_PORT=504
+    fi
     STATE=1
-    LASTSTATE=2
+    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
+               db_go
                ;;
            2)
                db_get citadel/WebcitApacheIntegration
                if test "$RET" = "Internal"; then
-                   db_input high citadel/WebcitHttpPort
+                   db_input high citadel/WebcitHttpPort || true
                else
-                   db_set citadel/WebcitHttpPort 8504
+                   db_set citadel/WebcitHttpPort 8504 || true
                fi
                ;;
            3)               
-               db_get citadel/WebcitApacheIntegration
+               db_get citadel/WebcitApacheIntegration || true
                if test "$RET" = "Internal"; then
-                   db_input high citadel/WebcitHttpsPort
-                   db_set citadel/WebcitBindIp 0.0.0.0
+                   db_input high citadel/WebcitHttpsPort || true
+                   export WEBCIT_LISTEN_IP=0.0.0.0
                else
                    db_set citadel/WebcitHttpsPort -1
-                   db_set citadel/WebcitBindIp 127.0.0.1
+                   export WEBCIT_LISTEN_IP=127.0.0.1
                fi
                ;;
            4)
-               db_input high citadel/WebcitInstallnote
+               db_input high citadel/WebcitOfferLang || true
+               db_go
+               ;;
+           5)
+               db_input high citadel/WebcitInstallnote||true
                ;;
        esac
        if db_go; then
@@ -73,11 +72,18 @@ if test "$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 citadel/WebcitOfferLang && WEBCIT_LANG="$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