X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=debian%2Fspamass-milter.postinst;h=5fb5ec853bddb0e5a71ae87984fe5ae25f30fe7e;hb=1fdb5c364472c17becdc8d17ca048df43b86e63a;hp=2e2661c0aa1bdb77b8601e0ab4fecc02597ae8e2;hpb=ab5c4477a5ea3c6c835ad9d65c7bae190319650f;p=deb_pkgs%2Fspamass-milter.git

diff --git a/debian/spamass-milter.postinst b/debian/spamass-milter.postinst
index 2e2661c..5fb5ec8 100644
--- a/debian/spamass-milter.postinst
+++ b/debian/spamass-milter.postinst
@@ -5,11 +5,29 @@ set -e
 case "$1" in
     configure)
         # Create the spamassmilter user
-	if [ -x /usr/sbin/adduser ]; then
-	    if ! id -u spamassmilter >/dev/null 2>&1; then
-		adduser --system --no-create-home spamassmilter;
+	if [ -x /usr/sbin/adduser ] && [ -x /usr/bin/getent ] && [ -x /usr/sbin/addgroup ]; then
+	    if ! getent group spamass-milter >/dev/null 2>&1; then
+		addgroup --system spamass-milter;
+	    fi;
+	    if ! id -u spamass-milter >/dev/null 2>&1; then
+		adduser --system --ingroup spamass-milter --home /var/lib/spamass-milter spamass-milter;
+		if [ -d /var/lib/spamass-milter ]; then 
+		    chown spamass-milter:spamass-milter /var/lib/spamass-milter
+		fi;
+	    elif id -nG spamass-milter |grep -q spamass-milter; then
+		if [ -x /usr/sbin/usermod ]; then
+		    usermod --gid spamass-milter spamass-milter;
+		fi;
 	    fi;
 	fi;
+    # create a home directory for spamass-milter if it does not exist,
+    # but only this once
+    if dpkg --compare-versions "$2" 'lt' '0.4.0-2'; then
+        if ! [ -d /var/lib/spamass-milter ]; then
+            mkdir /var/lib/spamass-milter &&
+                chown spamass-milter:spamass-milter /var/lib/spamass-milter;
+        fi;
+    fi;
 	# Attempt to remove /var/run/spamass if it exists
 
 	# If we're upgrading from -4 or earlier, we want to remove the
@@ -31,4 +49,4 @@ esac
     
 ###DEBHELPER###
 
-exit 0;
\ No newline at end of file
+exit 0;