[Pkg-nagios-changes] nagios/patches 02_reasonable_config.dpatch, 1.6, 1.7

[seanius at haydn.debian.org]

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

Modified Files:
	02_reasonable_config.dpatch 
Log Message:
init script is now a little more flexible.  changelog has details.


Index: 02_reasonable_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/02_reasonable_config.dpatch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 02_reasonable_config.dpatch	16 Oct 2005 18:23:33 -0000	1.6
+++ 02_reasonable_config.dpatch	17 Nov 2005 16:22:01 -0000	1.7
@@ -1,13 +1,13 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01_reasonable_config.dpatch by Joerg Jaspert <joerg at debian.org>
+##	further edits by sean finney <seanius at debian.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix the config.
+## DP: Fix the config for reasonable defaults.
 
 @DPATCH@
 diff -urNad sid~/sample-config/cgi.cfg.in sid/sample-config/cgi.cfg.in
---- sid~/sample-config/cgi.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/cgi.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/cgi.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/cgi.cfg.in	2005-11-17 17:10:00.000000000 +0100
 @@ -68,7 +68,13 @@
  # Nagios.  Run the 'ps' command manually to see what the command
  # line entry for the Nagios process looks like.
@@ -16,16 +16,16 @@
 +nagios_check_command=@libexecdir@/check_nagios @localstatedir@/status.log 5 'nagios'
 +
 +# Note: If you use the mysql or pgsql nagios build, read
-+# /usr/share/doc/nagios-common/README.Debian what todo to let nagios
++# /usr/share/doc/nagios-common/README.Debian what to do to let nagios
 +# CGI scripts detect nagios state.
 + 
-+#nagios_check_command=/etc/nagios/check_nagios_db
++#nagios_check_command=/usr/local/sbin/check_nagios_db
  
  
  
 diff -urNad sid~/sample-config/template-object/checkcommands.cfg.in sid/sample-config/template-object/checkcommands.cfg.in
---- sid~/sample-config/template-object/checkcommands.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/checkcommands.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/checkcommands.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/checkcommands.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -124,30 +124,30 @@
  	}
  
@@ -66,8 +66,8 @@
  	}
  
 diff -urNad sid~/sample-config/template-object/contactgroups.cfg.in sid/sample-config/template-object/contactgroups.cfg.in
---- sid~/sample-config/template-object/contactgroups.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/contactgroups.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/contactgroups.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/contactgroups.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -18,35 +18,35 @@
  ################################################################################
  
@@ -141,8 +141,8 @@
  
  
 diff -urNad sid~/sample-config/template-object/contacts.cfg.in sid/sample-config/template-object/contacts.cfg.in
---- sid~/sample-config/template-object/contacts.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/contacts.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/contacts.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/contacts.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -13,7 +13,7 @@
  ################################################################################
  # CONTACT DEFINITIONS
@@ -189,8 +189,8 @@
  
  
 diff -urNad sid~/sample-config/template-object/escalations.cfg.in sid/sample-config/template-object/escalations.cfg.in
---- sid~/sample-config/template-object/escalations.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/escalations.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/escalations.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/escalations.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -19,24 +19,33 @@
  
  # Serviceescalation definition
@@ -274,8 +274,8 @@
  
  
 diff -urNad sid~/sample-config/template-object/hostgroups.cfg.in sid/sample-config/template-object/hostgroups.cfg.in
---- sid~/sample-config/template-object/hostgroups.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/hostgroups.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/hostgroups.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/hostgroups.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -17,57 +17,67 @@
  #
  ################################################################################
@@ -380,8 +380,8 @@
  
  
 diff -urNad sid~/sample-config/template-object/hosts.cfg.in sid/sample-config/template-object/hosts.cfg.in
---- sid~/sample-config/template-object/hosts.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/hosts.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/hosts.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/hosts.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -21,8 +21,8 @@
  define host{
  	name				generic-host	; The name of this host template - referenced in other host definitions, used for template recursion/resolution
@@ -811,8 +811,8 @@
  
  
 diff -urNad sid~/sample-config/template-object/minimal.cfg.in sid/sample-config/template-object/minimal.cfg.in
---- sid~/sample-config/template-object/minimal.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/minimal.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/minimal.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/minimal.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -90,7 +90,7 @@
  # Command used to check disk space usage on local partitions
  
@@ -925,8 +925,8 @@
 -
 -# EOF
 diff -urNad sid~/sample-config/template-object/misccommands.cfg.in sid/sample-config/template-object/misccommands.cfg.in
---- sid~/sample-config/template-object/misccommands.cfg.in	2002-05-27 20:20:45.000000000 -0400
-+++ sid/sample-config/template-object/misccommands.cfg.in	2005-10-16 14:18:58.000000000 -0400
+--- sid~/sample-config/template-object/misccommands.cfg.in	2002-05-28 02:20:45.000000000 +0200
++++ sid/sample-config/template-object/misccommands.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -80,26 +80,58 @@
  #
  # SAMPLE PERFORMANCE DATA COMMANDS
@@ -998,8 +998,8 @@
  
  
 diff -urNad sid~/sample-config/template-object/services.cfg.in sid/sample-config/template-object/services.cfg.in
---- sid~/sample-config/template-object/services.cfg.in	2005-04-06 01:24:45.000000000 -0400
-+++ sid/sample-config/template-object/services.cfg.in	2005-10-16 13:28:58.000000000 -0400
+--- sid~/sample-config/template-object/services.cfg.in	2005-04-06 07:24:45.000000000 +0200
++++ sid/sample-config/template-object/services.cfg.in	2005-11-17 17:09:16.000000000 +0100
 @@ -19,15 +19,17 @@
  
  # Generic service definition template