[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. debian/0.25.4-2-25-gd901a8d

[Micah Anderson]

The following commit has been merged in the master branch:
commit d901a8d60fc8babbc835e04310a9347035bb8bc5
Author: Micah Anderson <micah at riseup.net>
Date:   Sat Apr 24 13:38:03 2010 -0400

    use dpkg-statoverride for confg.ru mode settings

diff --git a/debian/puppetmaster.postinst b/debian/puppetmaster.postinst
index ef6356d..faf3ce0 100644
--- a/debian/puppetmaster.postinst
+++ b/debian/puppetmaster.postinst
@@ -6,7 +6,10 @@ if [ "$1" = "configure" ]; then
     
     # Change the owner of the rack config.ru to be the puppet user
     # because passenger will suid to that user, see #577366
-    chown puppet:puppet /usr/share/puppet/rack/puppetmasterd/config.ru
+    if ! dpkg-statoverride --list /usr/share/puppet/rack/puppetmasterd/config.ru >/dev/null 2>&1
+    then
+	dpkg-statoverride --update --add puppet puppet 0644 /usr/share/puppet/rack/puppetmasterd/config.ru
+    fi
 fi
 
 #DEBHELPER#
diff --git a/debian/puppetmaster.postrm b/debian/puppetmaster.postrm
index cb7e17d..26d23e1 100644
--- a/debian/puppetmaster.postrm
+++ b/debian/puppetmaster.postrm
@@ -5,6 +5,10 @@ case "$1" in
 	rm -rf /var/log/puppet
 	rm -f /etc/puppet/puppetmasterd.conf
 	rm -rf /etc/puppet/ssl
+	if dpkg-statoverride --list /usr/share/puppet/rack/puppetmasterd/config.ru >/dev/null 2>&1
+	then
+	    dpkg-statoverride --remove /usr/share/puppet/rack/puppetmasterd/config.ru
+	fi
 	;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
         ;;

-- 
Puppet packaging for Debian