* Applied changes to debian files sent in by WG

diff --git a/citadel/ChangeLog b/citadel/ChangeLog
index 1cdf1eae3ea3319dfe12abe8981ec780d934b7d3..f43451e5987617a170ab6413ee7231c2dd378581 100644 (file)
--- a/citadel/ChangeLog
+++ b/citadel/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 654.7  2005/08/10 02:44:56  ajc
+* Applied changes to debian files sent in by WG
+
 Revision 654.6  2005/08/09 21:58:57  ajc
 * Removed the ./help/? hack; replaced with actual "show directory" code
   in the server.
@@ -7013,4 +7016,3 @@ Sat Jul 11 00:20:48 EDT 1998 Nathan Bryant <bryant@cs.usm.maine.edu>
 
 Fri Jul 10 1998 Art Cancro <ajc@uncensored.citadel.org>
        * Initial CVS import
-

diff --git a/citadel/debian/citadel-client.postinst b/citadel/debian/citadel-client.postinst
index 091dc3a750db706e5ca3404d6b3c8c31942f476b..97c63f4912988a89e836ea446916d24f71700381 100644 (file)
--- a/citadel/debian/citadel-client.postinst
+++ b/citadel/debian/citadel-client.postinst
@@ -15,7 +15,16 @@ case "$1" in
   configure)
     # Configure this package.  If the package must prompt the user for
     # information, do it here.
-       :
+    if ! getent group citadel >/dev/null; then 
+               groupadd citadel
+       fi
+       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
+       fi
+       mkdir -p /etc/citadel
+       chown citadel:citadel /etc/citadel
        gunzip -c  /usr/share/doc/citadel-client/examples/citadel.rc.gz> /tmp/citadel.rc
        ucf /tmp/citadel.rc /etc/citadel/citadel.rc
        rm -f /tmp/citadel.rc

diff --git a/citadel/debian/citadel-server.postinst b/citadel/debian/citadel-server.postinst
index b1884cf984e76801c55206da8937725b03a39323..d15ebeb388ec6f058a889c237634be63de786d3a 100644 (file)
--- a/citadel/debian/citadel-server.postinst
+++ b/citadel/debian/citadel-server.postinst
@@ -47,7 +47,7 @@ case "$1" in
     # Configure this package.  If the package must prompt the user for
     # information, do it here.
     if ! getent group citadel >/dev/null; then 
-               groupadd --system citadel
+               groupadd citadel
        fi
        if ! getent passwd citadel >/dev/null; then 
                adduser --system --ingroup citadel --home /var/lib/citadel \
@@ -55,6 +55,7 @@ case "$1" in
                        --disabled-password citadel
        fi
        mkdir -p /etc/citadel
+       chown citadel:citadel /etc/citadel
     # Activate menu-methods script
     #: chmod a+x /etc/menu-methods/foo