[Pkg-nagios-devel] nagios changelog,1.54,1.54.2.1 nagios-common.postrm,1.7,1.7.2.1

Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv27562

Modified Files:
      Tag: nagios_1_x_sarge
	changelog nagios-common.postrm 
Log Message:
fix for #311526


Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.54
retrieving revision 1.54.2.1
diff -u -d -r1.54 -r1.54.2.1

--- changelog	16 Apr 2005 05:13:31 -0000	1.54
+++ changelog	2 Jun 2005 13:10:12 -0000	1.54.2.1
@@ -1,3 +1,9 @@
+nagios (2:1.3-cvs.20050402-3) unstable; urgency=low
+  * Sean Finney:
+    - don't blindly rm -rf /etc/nagios at purge time, that's stupid!
+
+ -- sean finney <seanius@debian.org>  Thu, 02 Jun 2005 08:58:51 -0400
+
 nagios (2:1.3-cvs.20050402-2) unstable; urgency=low
   
   * Sean Finney:

Index: nagios-common.postrm
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postrm,v
retrieving revision 1.7
retrieving revision 1.7.2.1
diff -u -d -r1.7 -r1.7.2.1
--- nagios-common.postrm	28 Mar 2005 14:42:56 -0000	1.7
+++ nagios-common.postrm	2 Jun 2005 13:10:12 -0000	1.7.2.1
@@ -34,8 +34,10 @@
 case "$1" in
     purge|remove|abort-install|abort-upgrade|failed-upgrade|disappear)
 	if [ "$1" = "purge" ]; then
-	    # Remove logfiles
-		rm -Rf {/var/cache,/var/run,/var/log,/etc}/nagios
+	    # Remove logfiles and other cruft at purge time
+		rm -Rf {/var/cache,/var/run,/var/log}/nagios
+		rm -f /etc/nagios/hosts.cfg /etc/nagios/htpasswd.users
+
 		# remove stat overrides
 		dpkg-statoverride --list '/usr/lib/cgi-bin/nagios/*.cgi' | \
 			cut -d' ' -f4 | xargs -r -n 1 dpkg-statoverride --remove



