[Pkg-nagios-changes] [pkg-nagvis] 02/02: Make sure to unregister /etc/apache2/conf.d/nagvis.conf on migration and purge

[Markus Frosch]

This is an automated email from the git hooks/post-receive script.

lazyfrosch-guest pushed a commit to branch master
in repository pkg-nagvis.

commit 61c5f4338b951adcb6ef2dd11c8ce5e2296de563
Author: Markus Frosch <markus at lazyfrosch.de>
Date:   Thu Dec 12 23:17:22 2013 +0100

    Make sure to unregister /etc/apache2/conf.d/nagvis.conf on migration and purge
---
 debian/nagvis.postinst | 1 +
 debian/nagvis.postrm   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/nagvis.postinst b/debian/nagvis.postinst
index 7b95597..696195a 100644
--- a/debian/nagvis.postinst
+++ b/debian/nagvis.postinst
@@ -26,6 +26,7 @@ if dpkg --compare-versions "$2" lt-nl "1:1.7.9+dfsg1-1~"; then
         /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf "1:1.7.9+dfsg1-1~" nagvis -- "$@"
 
     # unregister old file
+    ucf -p /etc/apache2/conf.d/nagvis.conf
     ucfr -p nagvis /etc/apache2/conf.d/nagvis.conf
     # delete helper file
     rm -f /etc/nagvis/apache2.conf.dpkg-new
diff --git a/debian/nagvis.postrm b/debian/nagvis.postrm
index fb9ef9b..ac4e1d8 100644
--- a/debian/nagvis.postrm
+++ b/debian/nagvis.postrm
@@ -42,7 +42,7 @@ case "$1" in
     purge)
         ## remove apache part of the configuration and nagvis' ini file
         ## (both generetaded in postinst)
-        for conf_file in /etc/nagvis/apache2.conf /etc/nagvis/nagvis.ini.php ; do
+        for conf_file in /etc/apache2/conf.d/nagvis.conf /etc/nagvis/apache2.conf /etc/nagvis/nagvis.ini.php ; do
             rm -f "$conf_file"
             if which ucf >/dev/null; then
                 ucf --purge "$conf_file"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-nagvis.git