There can be only two.

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

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