[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, master, updated. 4c4929d63fc0e8a7634dafd97a1b28146938b250

[Micah Anderson]

The following commit has been merged in the master branch:
commit 4c4929d63fc0e8a7634dafd97a1b28146938b250
Author: Micah Anderson <micah at riseup.net>
Date:   Tue May 20 08:07:50 2008 -0400

    * Add puppetmaster.postrm to remove /var/log/puppet on purge
    * Added debian/puppetmaster.dirs containing etc/puppet/manifests
    * Remove puppet group on purge (Closes: #481511)
    * Remove old config files (Closes: #454681)

diff --git a/debian/changelog b/debian/changelog
index fdb3503..a233f3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ puppet (0.24.4-7) unstable; urgency=low
   * Fix variable name in /etc/default/puppetmaster comments
   * Fix incorrect port increment in puppetmaster initscript when mongrel
     is used, thanks Francois Deppierraz (Closes: #480263)
+  * Add puppetmaster.postrm to remove /var/log/puppet on purge
+  * Added debian/puppetmaster.dirs containing etc/puppet/manifests
+  * Remove puppet group on purge (Closes: #481511)
+  * Remove old config files and stray directories (Closes: #454681)
   
  -- Micah Anderson <micah at debian.org>>  Sat, 03 May 2008 16:18:32 -0400
   
diff --git a/debian/puppet.postrm b/debian/puppet.postrm
index da994c3..85d4b99 100644
--- a/debian/puppet.postrm
+++ b/debian/puppet.postrm
@@ -4,6 +4,8 @@ case "$1" in
     purge)
 	rm -rf /var/lib/puppet
 	/usr/sbin/deluser --system puppet
+	/usr/sbin/delgroup --system puppet
+	rm -f /etc/puppet/puppetd.conf
 	;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
 
diff --git a/debian/puppetmaster.dirs b/debian/puppetmaster.dirs
new file mode 100644
index 0000000..420c923
--- /dev/null
+++ b/debian/puppetmaster.dirs
@@ -0,0 +1 @@
+etc/puppet/manifests
\ No newline at end of file
diff --git a/debian/puppet.postrm b/debian/puppetmaster.postrm
similarity index 73%
copy from debian/puppet.postrm
copy to debian/puppetmaster.postrm
index da994c3..8ef76b6 100644
--- a/debian/puppet.postrm
+++ b/debian/puppetmaster.postrm
@@ -2,12 +2,11 @@
 
 case "$1" in
     purge)
-	rm -rf /var/lib/puppet
-	/usr/sbin/deluser --system puppet
+	rm -rf /var/log/puppet
+	rm -f /etc/puppet/puppetmasterd.conf
+	rm -rf /etc/puppet/ssl
 	;;
     remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-
-
         ;;
 
     *)

-- 
Puppet packaging for Debian