pnp4nagios.postrm: Fixed typo: Apache's config files use file suffix .conf.

… rather than .cfg; this prevented /etc/apache2/conf.d/pnp4nagios.conf from
being removed on remove/purge; thanks to Andreas Beckmann for reporting this.
cf. #669839

diff --git a/debian/changelog b/debian/changelog
index c5f5d0f1c78742dbcf6009f9a9403f23532b4b50..35772a56c63ea59d9b130ac19bfaabc8fb6cace8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+pnp4nagios (0.6.16-2) unstable; urgency=low
+
+  * debian/pnp4nagios.postrm:
+    - Fixed typo: Apache's config files use file suffix .conf rather than
+      .cfg; this prevented /etc/apache2/conf.d/pnp4nagios.conf from being
+      removed on remove/purge; thanks to Andreas Beckmann for reporting this
+      (cf. #669839).
+
+ -- Sebastian Harl <tokkee@debian.org>  Tue, 24 Apr 2012 14:44:33 +0200
+
 pnp4nagios (0.6.16-1) unstable; urgency=low
 
   * New upstream version.

diff --git a/debian/pnp4nagios-web.postrm b/debian/pnp4nagios-web.postrm
index 40781abd2e035440c007a7311e989f1b81d0b0bd..5b0a21a2cdaeddec325a7e218bf8a904bcda3aed 100644 (file)
--- a/debian/pnp4nagios-web.postrm
+++ b/debian/pnp4nagios-web.postrm
@@ -22,10 +22,10 @@ set -e
 case "$1" in
        purge|remove)
                if [ -d /etc/apache2/conf.d/ ]; then
-                       if [ -L /etc/apache2/conf.d/pnp4nagios.cfg ]; then
-                               ls -l /etc/apache2/conf.d/pnp4nagios.cfg | grep -q /etc/pnp4nagios/apache.cfg
+                       if [ -L /etc/apache2/conf.d/pnp4nagios.conf ]; then
+                               ls -l /etc/apache2/conf.d/pnp4nagios.conf | grep -q /etc/pnp4nagios/apache.conf
                                if [ $? -eq 0 ]; then
-                                       rm -f /etc/apache2/conf.d/pnp4nagios.cfg
+                                       rm -f /etc/apache2/conf.d/pnp4nagios.conf
                                fi
                        fi
                fi