'Network User' is now 'Normal User'

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

diff --git a/citadel/debian/citadel-server.config b/citadel/debian/citadel-server.config
index 80dbb9d9156ad8bbb2ef2e9f34cb1a8c47c9c9ba..c095a488175376c154de5e65aad78f547ae580ca 100755 (executable)
--- 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
                ;;