[Pkg-nagios-devel] nagios changelog,1.48,1.49 nagios-common.postinst,1.10,1.11 nagios-common.postrm,1.6,1.7
seanius@haydn.debian.org
seanius@haydn.debian.org
Update of /cvsroot/pkg-nagios/nagios
In directory haydn:/org/alioth.debian.org/chroot/home/users/seanius/tmp/cvs-serv31677
Modified Files:
changelog nagios-common.postinst nagios-common.postrm
Log Message:
two minor bugfixes, details in changelog
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- changelog 16 Mar 2005 14:23:14 -0000 1.48
+++ changelog 28 Mar 2005 14:42:55 -0000 1.49
@@ -1,3 +1,16 @@
+nagios (2:1.3-cvs.20050116-6) unstable; urgency=low
+
+ * sean finney:
+ - remove duplicate call do db_purge in maintainer scripts
+ - remove duplicate call to invoke-rc.d in maintainer scripts, thanks
+ to alban browaeys(?) <browaeys.alban@wanadoo.fr> (closes: #301099).
+ - don't jump the gun and use htpasswd-caudium just because it exists.
+ instead, make sure that the admin has also not selected to configure
+ nagios for apache variants (in which case htpasswd should stay as
+ the nagios htpasswd). thanks again to alban (closes: #301105).
+
+ -- sean finney <seanius@debian.org> Mon, 28 Mar 2005 14:20:56 +0000
+
nagios (2:1.3-cvs.20050116-5) unstable; urgency=low
* sean finney:
Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- nagios-common.postinst 24 Feb 2005 01:50:39 -0000 1.10
+++ nagios-common.postinst 28 Mar 2005 14:42:56 -0000 1.11
@@ -95,7 +95,7 @@
*) webservers="";;
esac
- if [ -e "/usr/bin/htpasswd-caudium" ]; then
+ if [ -e "/usr/bin/htpasswd-caudium" -a -z "$webservers" ]; then
htpasswd="/usr/bin/htpasswd-caudium"
fi
Index: nagios-common.postrm
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postrm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- nagios-common.postrm 15 Feb 2005 22:17:39 -0000 1.6
+++ nagios-common.postrm 28 Mar 2005 14:42:56 -0000 1.7
@@ -33,14 +33,12 @@
case "$1" in
purge|remove|abort-install|abort-upgrade|failed-upgrade|disappear)
- invoke-rc.d nagios stop || true
if [ "$1" = "purge" ]; then
- db_purge
# Remove logfiles
rm -Rf {/var/cache,/var/run,/var/log,/etc}/nagios
# remove stat overrides
dpkg-statoverride --list '/usr/lib/cgi-bin/nagios/*.cgi' | \
- cut -d' ' -f4 | xargs -r -n 1 dpkg-statoverride --remove
+ cut -d' ' -f4 | xargs -r -n 1 dpkg-statoverride --remove
else
# Remove apache config if wanted.
db_get nagios/configapache