X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=debian%2Fpostinst;h=1d53d07b1eb3bffa4946ef4fe098b1e294f1783a;hb=6cf41422b99349e14b58d20b5b845ee2d4e578b8;hp=c841c41c9483e80e182312e147964deb70d3e0d3;hpb=4715e1ff4ca0655d4e06996ac22693b442facf66;p=privoxy.git

diff --git a/debian/postinst b/debian/postinst
index c841c41c..1d53d07b 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -25,17 +25,45 @@ set -e
 
 CONFDIR=/etc/privoxy
 CONFIG=$CONFDIR/config
+EXAMPLE_CONFIG=/usr/share/privoxy/config
+
+. /usr/share/debconf/confmodule
 
 case "$1" in
     configure)
         adduser --quiet --system --home $CONFDIR --no-create-home \
 	    --ingroup nogroup --disabled-password privoxy
-        chown -R privoxy:adm /var/log/privoxy
+        chown privoxy:adm /var/log/privoxy
+	[ -f /var/log/privoxy/logfile ] \
+	    && chown privoxy:adm /var/log/privoxy/logfile
         chmod 750 /var/log/privoxy
 	chown privoxy $CONFDIR/user.action $CONFDIR/trust
-	[ -f $CONFDIR/matcha-all.action ] \
+	[ -f $CONFDIR/match-all.action ] \
 	    && chown privoxy $CONFDIR/match-all.action
 
+	db_get privoxy/listen-address || true
+	perl -le '
+                $done = 0;
+                while (<STDIN>) {
+                    chomp;
+                    if ($_ =~ m/^\s*listen-address\s+.*/) {
+                        if (!$done) {
+                            foreach (@ARGV) {
+                                print "listen-address  $_";
+                            }
+                        }
+                        $done = 1;
+                    } else {
+                        print;
+                    }
+                }' \
+	     $RET \
+	     < $EXAMPLE_CONFIG > $CONFIG.ucftmp
+	ucf --three-way --debconf-ok $CONFIG.ucftmp $CONFIG
+	ucfr privoxy $CONFIG
+	rm -f $CONFIG.ucftmp
+	db_stop
+
 	if [ "x$2" != "x" ] && dpkg --compare-versions "$2" lt "3.0.4"
 	then
 	    # Upgrading from a 3.0.3* version