[Pkg-nagios-devel] nagios changelog, 1.68, 1.69 nagios-common.postinst, 1.14, 1.15

[seanius at haydn.debian.org]

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

Modified Files:
	changelog nagios-common.postinst 
Log Message:
    - a couple more "|| true" additions to chmod/chown on config
      files to cover cases where folks remove config files.
    - fix for distributed monitoring plugin submit_check_result_via_nsca
      to send the numeric status instead of the string representations,
      which lead to... interesting reuslts and general confusion.  thanks
      stephen gran for pointing this out (closes: #314371).


Index: changelog
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/changelog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- changelog	15 Jul 2005 08:06:07 -0000	1.68
+++ changelog	22 Jul 2005 06:27:42 -0000	1.69
@@ -3,13 +3,19 @@
   * Sean Finney:
     - removed the upgrade scripts and all other references to netsaint,
       as now there's a full debian release between us and when netsaint
-	  was part of the archive.
-	- thanks to cyril bouthors for politely pointing out that his
-	  last name is not "bouthers" but "bouthors".  sorry :)
-   * Guido Trotter:
-     - Changed Guido's uploader's email
+      was part of the archive.
+    - thanks to cyril bouthors for politely pointing out that his
+      last name is not "bouthers" but "bouthors".  sorry :)
+    - a couple more "|| true" additions to chmod/chown on config
+      files to cover cases where folks remove config files.
+    - fix for distributed monitoring plugin submit_check_result_via_nsca
+      to send the numeric status instead of the string representations,
+      which lead to... interesting reuslts and general confusion.  thanks
+      stephen gran for pointing this out (closes: #314371).
+  * Guido Trotter:
+    - Changed Guido's uploader's email
 
- -- sean finney <seanius at debian.org>  Wed, 06 Jul 2005 18:54:44 -0400
+ -- sean finney <seanius at debian.org>  Thu, 21 Jul 2005 15:16:14 -0400
 
 nagios (2:1.3-cvs.20050402-4) unstable; urgency=low
 

Index: nagios-common.postinst
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/nagios-common.postinst,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- nagios-common.postinst	4 Jul 2005 16:46:34 -0000	1.14
+++ nagios-common.postinst	22 Jul 2005 06:27:45 -0000	1.15
@@ -123,8 +123,8 @@
 disregard this.  Otherwise, the htpasswd file should be called:
 	/etc/nagios/htpasswd.users
 and be mode 0640, owned by root, group www-data.
-	chown root:www-data /etc/nagios/htpasswd.users
-	chmod 0640 /etc/nagios/htpasswd.users
+	chown root:www-data /etc/nagios/htpasswd.users || true
+	chmod 0640 /etc/nagios/htpasswd.users || true
 EOF
 	fi
 
@@ -205,6 +205,6 @@
 # Make sure the config file is readable by both nagios
 # and apache
 chown -R nagios:www-data /var/log/nagios /etc/nagios /var/run/nagios /var/cache/nagios
-chmod 750 /etc/nagios/cgi.cfg
+chmod 750 /etc/nagios/cgi.cfg || true
 
 #DEBHELPER#