X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fdebian%2Fcitadel-server.config;h=c095a488175376c154de5e65aad78f547ae580ca;hb=a2ae8dfea31fc1495e3a97b28f3ddca01f491bef;hp=80dbb9d9156ad8bbb2ef2e9f34cb1a8c47c9c9ba;hpb=c14a4bbf13d467a509232928efe83a5fbeacffab;p=citadel.git

diff --git a/citadel/debian/citadel-server.config b/citadel/debian/citadel-server.config
index 80dbb9d91..c095a4881 100755
--- a/citadel/debian/citadel-server.config
+++ b/citadel/debian/citadel-server.config
@@ -11,7 +11,7 @@ DO_CONFIGURE=no
 
 if test -n "$2"; then
 # do we want to reconfigure?
-    if test "`echo $2 | sed -e 's/[.-]//g'`" -lt 127 \
+    if test "`echo $2 | sed -e 's/[.-]//g' -e 's;ubuntu;;'`" -lt 127 \
 	-o "$1" = reconfigure
 	then
 	DO_CONFIGURE=yes
@@ -26,7 +26,7 @@ fi
 
 if test "$DO_CONFIGURE" = "yes"; then
     STATE=1
-    LASTSTATE=4
+    LASTSTATE=8
     while [ "$STATE" != 0 -a "$STATE" -le "$LASTSTATE" ]; do
 
 	case "$STATE" in
@@ -38,6 +38,35 @@ if test "$DO_CONFIGURE" = "yes"; then
 		;;
 	    3)
 		db_input high citadel/LoginType || true
+	        db_get citadel/LoginType 
+		case "$RET" in
+		    Internal)
+			STATE=8
+			;;
+		    Host)
+			STATE=8
+			;;
+		esac
+		;;
+
+	    4)
+		db_input citadel/LDAPServer || true
+		;;
+
+	    5)
+		db_input citadel/LDAPServerPort || true 
+		;;
+
+	    6)
+		db_input citadel/LDAPBaseDN || true 
+		;;
+
+	    7)
+		db_input citadel/LDAPBindDN || true
+		;;
+
+	    8)
+		db_input citadel/LDAPBindDNPassword || true
 		;;