From c35c476c95731539bf3b06ea4e1dbd24de995277 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Wilfried=20G=C3=B6esgens?= <willi@citadel.org>
Date: Tue, 30 Jan 2007 23:04:01 +0000
Subject: [PATCH] * ask questions on install too * create user more acurate *
 added this to changelog.

---
 citadel/debian/changelog               | 7 +++++++
 citadel/debian/citadel-common.dirs     | 3 ++-
 citadel/debian/citadel-common.postinst | 2 +-
 citadel/debian/citadel-server.config   | 9 ++++++++-
 4 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/citadel/debian/changelog b/citadel/debian/changelog
index 580d1478e..c5bb779e0 100644
--- a/citadel/debian/changelog
+++ b/citadel/debian/changelog
@@ -1,3 +1,10 @@
+citadel (7.03-3) unstable; urgency=low
+	
+  * create user without error messages in  citadel-common
+  * ask our questions on login.
+
+ -- Wilfried Goesgens <citadel@outgesourced.org>  Fri, 05 Jan 2007 00:12:00 +0100
+
 citadel (7.03-2) unstable; urgency=low
 	
   * corrected locating chkpwd
diff --git a/citadel/debian/citadel-common.dirs b/citadel/debian/citadel-common.dirs
index 3488215ef..c98ea1f7f 100644
--- a/citadel/debian/citadel-common.dirs
+++ b/citadel/debian/citadel-common.dirs
@@ -1 +1,2 @@
-etc/citadel
\ No newline at end of file
+etc/citadel
+var/lib/citadel
\ No newline at end of file
diff --git a/citadel/debian/citadel-common.postinst b/citadel/debian/citadel-common.postinst
index 37c560c0f..30e9104c9 100644
--- a/citadel/debian/citadel-common.postinst
+++ b/citadel/debian/citadel-common.postinst
@@ -15,7 +15,7 @@ case "$1" in
         if ! getent passwd citadel >/dev/null; then 
             adduser --system --ingroup citadel --home /var/lib/citadel \
                     --gecos "Citadel system user" --shell /bin/sh \
-                    --disabled-password citadel
+                    --disabled-password --no-create-home citadel --shell /bin/false
         fi
 
         chown -R citadel:citadel /etc/citadel
diff --git a/citadel/debian/citadel-server.config b/citadel/debian/citadel-server.config
index 15bf6b58b..390e0c335 100755
--- a/citadel/debian/citadel-server.config
+++ b/citadel/debian/citadel-server.config
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 set -e
 
 # source debconf stuff
@@ -16,6 +15,14 @@ if test -n "$2"; then
         db_input high citadel/Installnote
         db_go
     fi
+else 
+    if test "$1" = "configure"; then
+        db_input high citadel/ServerIPAddress
+        db_input high citadel/Administrator
+        db_input high citadel/LoginType
+        db_input high citadel/Installnote
+        db_go
+    fi
 fi
 
 exit 0
-- 
2.30.2