[Pkg-nagios-devel] nagios changelog,1.57,1.58 nagios-common.postinst,1.11,1.12
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-serv9840
Modified Files:
changelog nagios-common.postinst
Log Message:
fix for 313584.
Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- changelog 12 May 2005 00:05:40 -0000 1.57
+++ changelog 19 Jun 2005 12:13:56 -0000 1.58
@@ -1,4 +1,4 @@
-nagios (2:1.3-cvs.20050402-3) unstable; urgency=low
+nagios (2:1.3-cvs.20050402-3) UNRELEASED; urgency=low
* Sean Finney:
- compile with --with-file-perfdata (closes: #306555).
@@ -6,8 +6,11 @@
Steve Mynott <steve.mynott@gmail.com> (closes: #308530:).
- documentation fixes in README.pgsql, thanks for this go to
Turbo Fredriksson <turbo@bayour.com> (closes: #308564, #308568).
+ - don't chmod resource.cfg if it doesn't exist, which would cause
+ the postinst scripts to fail. thaks to Norbert Tretkowski for
+ reporting this (leaving bug open for sarge posterity).
- -- sean finney <seanius@debian.org> Tue, 10 May 2005 20:39:37 -0400
+ -- sean finney <seanius@debian.org> Sun, 19 Jun 2005 08:13:02 -0400
nagios (2:1.3-cvs.20050402-2) unstable; urgency=low
Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- nagios-common.postinst 28 Mar 2005 14:42:56 -0000 1.11
+++ nagios-common.postinst 19 Jun 2005 12:13:57 -0000 1.12
@@ -153,7 +153,10 @@
if [ -f /etc/nagios/htpasswd.users ]; then
# Make sure some files aren't world readable, may contain sensitive information
- chmod 640 /etc/nagios/htpasswd.users /etc/nagios/cgi.cfg /etc/nagios/resource.cfg
+ for f in htpasswd.users cgi.cfg resource.cfg; do
+ if [ -f /etc/nagios/$f ]; then
+ chmod 640 /etc/nagios/$f
+ done
chgrp www-data /etc/nagios/htpasswd.users
fi