* 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 a6f2323814e3eb0317a72c64a3f27eda48a2b179..b266d2cb6d44527b18876633a4736d4eab56696d 100755 (executable)
--- a/webcit/debian/citadel-webcit.config
+++ b/webcit/debian/citadel-webcit.config
@@ -24,21 +24,19 @@ fi
 
 if test "$DO_CONFIGURE" = "yes"; then
     if test -e /etc/default/webcit; then
-       source /etc/default/webcit
+       . /etc/default/webcit
     else
        export WEBCIT_CITADEL_IP=127.0.0.1
        export WEBCIT_CITADEL_PORT=504
     fi
     STATE=1
-    LASTSTATE=4
+    LASTSTATE=5
     while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
 
        case "$STATE" in
            1)
-       echo aou $STATE>>/tmp/bla
                db_input high citadel/WebcitApacheIntegration || true
                db_go
-       echo aou $STATE>>/tmp/bla
                ;;
            2)
                db_get citadel/WebcitApacheIntegration
@@ -55,10 +53,14 @@ if test "$DO_CONFIGURE" = "yes"; then
                    export WEBCIT_LISTEN_IP=0.0.0.0
                else
                    db_set citadel/WebcitHttpsPort -1
-                   export WEBCIT_LISTEN_IP= 127.0.0.1
+                   export WEBCIT_LISTEN_IP=127.0.0.1
                fi
                ;;
            4)
+               db_input high citadel/WebcitOfferLang || true
+               db_go
+               ;;
+           5)
                db_input high citadel/WebcitInstallnote||true
                ;;
        esac
@@ -70,11 +72,18 @@ 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 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