[Pkg-citadel-commit] r245 - citadel/trunk/debian

[meskes at alioth.debian.org]

Author: meskes
Date: 2009-03-02 09:16:47 +0000 (Mon, 02 Mar 2009)
New Revision: 245

Modified:
   citadel/trunk/debian/citadel-server.config
   citadel/trunk/debian/citadel-server.postinst
   citadel/trunk/debian/citadel-server.templates
Log:
Create admin system user if needed.



Modified: citadel/trunk/debian/citadel-server.config
===================================================================
--- citadel/trunk/debian/citadel-server.config	2009-03-01 20:59:31 UTC (rev 244)
+++ citadel/trunk/debian/citadel-server.config	2009-03-02 09:16:47 UTC (rev 245)
@@ -34,10 +34,10 @@
 		db_input high citadel/ServerIPAddress || true
 		;;
 	    2)
-		db_input high citadel/Administrator || true
+		db_input high citadel/LoginType || true
 		;;
 	    3)
-		db_input high citadel/LoginType || true
+		db_input high citadel/Administrator || true
 		;;
 
 

Modified: citadel/trunk/debian/citadel-server.postinst
===================================================================
--- citadel/trunk/debian/citadel-server.postinst	2009-03-01 20:59:31 UTC (rev 244)
+++ citadel/trunk/debian/citadel-server.postinst	2009-03-02 09:16:47 UTC (rev 245)
@@ -29,6 +29,12 @@
 
         if test "$deb_enable_unix_auth" = "true"; then
             export ENABLE_UNIX_AUTH=yes
+	    # check whether administrator user exists, if not create it
+	    if ! getent passwd $admin >/dev/null; then
+	      adduser --quiet --system \
+		--no-create-home \
+		--gecos "Citadel administrator" $admin
+	    fi
         else
             export ENABLE_UNIX_AUTH=no
         fi

Modified: citadel/trunk/debian/citadel-server.templates
===================================================================
--- citadel/trunk/debian/citadel-server.templates	2009-03-01 20:59:31 UTC (rev 244)
+++ citadel/trunk/debian/citadel-server.templates	2009-03-02 09:16:47 UTC (rev 245)
@@ -22,7 +22,8 @@
 
 Template: citadel/Administrator
 Type: string
-Default: Administrator
+Default: admin
 _Description: Citadel administrator username:
  Please enter the name of the Citadel user account that should be granted
  administrative privileges once created.
+ This user account will be created if needed.