X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=debian%2Fpostinst;h=ccf2a17b1fd27b65d582aad6e666ae27e673eb0c;hp=ee710cfb64f55b5b565fc8a6daf173038683937d;hb=802ee517a80ddfc91e1e2edaf8247092f8dee546;hpb=58e98c968352e34221c8e12370408e73402eb59a

diff --git a/debian/postinst b/debian/postinst
index ee710cfb..ccf2a17b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,13 +25,27 @@ set -e
 
 case "$1" in
     configure)
-        if ! grep -q '^privoxy:' /etc/passwd
+        if ! adduser --quiet --system --home /etc/privoxy --no-create-home \
+		     --ingroup nogroup --disabled-password privoxy
         then
-            adduser --system --home /etc/privoxy --ingroup nogroup \
-                    --disabled-password privoxy >/dev/null
-        fi
-        chown -R privoxy.adm /var/log/privoxy /etc/privoxy
-        chmod 750 /var/log/privoxy /etc/privoxy
+	    # user privoxy seems to exist
+	    # -> remove him before newly adding him.
+	    deluser --quiet privoxy
+	    adduser --quiet --system --home /etc/privoxy --no-create-home \
+		    --ingroup nogroup --disabled-password privoxy
+	fi
+        chown -R privoxy.adm /var/log/privoxy
+        chmod 750 /var/log/privoxy
+	chown privoxy /etc/privoxy/user.action /etc/privoxy/trust
+	[ -f /etc/privoxy/global.action ] \
+	    && chown privoxy /etc/privoxy/global.action
+
+	if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.4"
+	then
+	    # Upgrading from a 3.0.3* version
+	    chown root /etc/privoxy/standard.action \
+		       /etc/privoxy/default.action
+	fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)