[Pkg-nagios-devel] nagios/patches 02_reasonable_config.dpatch,1.2,1.3 07_fix_default_config.dpatch,1.2,1.3

joerg@haydn.debian.org joerg@haydn.debian.org 

Update of /cvsroot/pkg-nagios/nagios/patches
In directory haydn:/tmp/cvs-serv29433/patches

Modified Files:
	02_reasonable_config.dpatch 07_fix_default_config.dpatch 
Log Message:
The 3 preinst are required until this new nagios made its way into sarge,
then they are to be deleted.
Fixed two other failures with update-nagios and default configs.

I think next upload goes to unstable!


Index: 02_reasonable_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/02_reasonable_config.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 02_reasonable_config.dpatch	13 Nov 2004 23:56:20 -0000	1.2
+++ 02_reasonable_config.dpatch	17 Nov 2004 23:30:08 -0000	1.3
@@ -5,21 +5,27 @@
 ## DP: Fix the config.
 
 @DPATCH@
-diff -urNad nagios-1.2/sample-config/cgi.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/cgi.cfg.in
---- nagios-1.2/sample-config/cgi.cfg.in	2004-11-14 00:03:30.640757952 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/cgi.cfg.in	2004-11-14 00:04:50.574889247 +0100
-@@ -68,7 +68,7 @@
+diff -urNad nagios-1.3/sample-config/cgi.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/cgi.cfg.in
+--- nagios-1.3/sample-config/cgi.cfg.in	2004-11-17 23:40:21.619435517 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/cgi.cfg.in	2004-11-17 23:45:35.474930119 +0100
+@@ -68,7 +68,13 @@
  # Nagios.  Run the 'ps' command manually to see what the command
  # line entry for the Nagios process looks like.
  
 -#nagios_check_command=@libexecdir@/check_nagios @localstatedir@/status.log 5 '@bindir@/nagios'
 +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
++# CGI scripts detect nagios state.
++ 
++#nagios_check_command=/etc/nagios/check_nagios_db
  
  
  
-diff -urNad nagios-1.2/sample-config/template-object/checkcommands.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/checkcommands.cfg.in
---- nagios-1.2/sample-config/template-object/checkcommands.cfg.in	2004-11-14 00:03:30.641757803 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/checkcommands.cfg.in	2004-11-14 00:04:50.574889247 +0100
+diff -urNad nagios-1.3/sample-config/template-object/checkcommands.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/checkcommands.cfg.in
+--- nagios-1.3/sample-config/template-object/checkcommands.cfg.in	2004-11-17 23:40:21.619435517 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/checkcommands.cfg.in	2004-11-17 23:42:51.447291281 +0100
 @@ -124,30 +124,30 @@
  	}
  
@@ -59,9 +65,9 @@
  	command_line	$USER1$/check_load -w $ARG1$ -c $ARG2$
  	}
  
-diff -urNad nagios-1.2/sample-config/template-object/contactgroups.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/contactgroups.cfg.in
---- nagios-1.2/sample-config/template-object/contactgroups.cfg.in	2004-11-14 00:03:30.641757803 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/contactgroups.cfg.in	2004-11-14 00:04:50.575889099 +0100
+diff -urNad nagios-1.3/sample-config/template-object/contactgroups.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contactgroups.cfg.in
+--- nagios-1.3/sample-config/template-object/contactgroups.cfg.in	2004-11-17 23:40:21.620435356 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contactgroups.cfg.in	2004-11-17 23:42:51.448291120 +0100
 @@ -18,35 +18,35 @@
  ################################################################################
  
@@ -134,9 +140,9 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/contacts.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/contacts.cfg.in
---- nagios-1.2/sample-config/template-object/contacts.cfg.in	2004-11-14 00:03:30.641757803 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/contacts.cfg.in	2004-11-14 00:04:50.575889099 +0100
+diff -urNad nagios-1.3/sample-config/template-object/contacts.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contacts.cfg.in
+--- nagios-1.3/sample-config/template-object/contacts.cfg.in	2004-11-17 23:40:21.621435195 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/contacts.cfg.in	2004-11-17 23:42:51.448291120 +0100
 @@ -33,16 +33,16 @@
  
  
@@ -165,9 +171,9 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/escalations.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/escalations.cfg.in
---- nagios-1.2/sample-config/template-object/escalations.cfg.in	2004-11-14 00:03:30.641757803 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/escalations.cfg.in	2004-11-14 00:04:50.575889099 +0100
+diff -urNad nagios-1.3/sample-config/template-object/escalations.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/escalations.cfg.in
+--- nagios-1.3/sample-config/template-object/escalations.cfg.in	2004-11-17 23:40:21.621435195 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/escalations.cfg.in	2004-11-17 23:42:51.448291120 +0100
 @@ -19,24 +19,33 @@
  
  # Serviceescalation definition
@@ -250,9 +256,9 @@
  
  
  
-diff -urNad nagios-1.2/sample-config/template-object/hostgroups.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/hostgroups.cfg.in
---- nagios-1.2/sample-config/template-object/hostgroups.cfg.in	2004-11-14 00:03:30.642757655 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/hostgroups.cfg.in	2004-11-14 00:04:50.575889099 +0100
+diff -urNad nagios-1.3/sample-config/template-object/hostgroups.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hostgroups.cfg.in
+--- nagios-1.3/sample-config/template-object/hostgroups.cfg.in	2004-11-17 23:40:21.622435033 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hostgroups.cfg.in	2004-11-17 23:42:51.448291120 +0100
 @@ -17,57 +17,67 @@
  #
  ################################################################################
@@ -356,9 +362,9 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/hosts.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/hosts.cfg.in
---- nagios-1.2/sample-config/template-object/hosts.cfg.in	2004-11-14 00:03:30.643757507 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/hosts.cfg.in	2004-11-14 00:06:21.820335420 +0100
+diff -urNad nagios-1.3/sample-config/template-object/hosts.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hosts.cfg.in
+--- nagios-1.3/sample-config/template-object/hosts.cfg.in	2004-11-17 23:40:21.623434872 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/hosts.cfg.in	2004-11-17 23:42:51.449290959 +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
@@ -787,9 +793,9 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/minimal.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/minimal.cfg.in
---- nagios-1.2/sample-config/template-object/minimal.cfg.in	2004-11-14 00:03:30.644757358 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/minimal.cfg.in	2004-11-14 00:04:50.601885238 +0100
+diff -urNad nagios-1.3/sample-config/template-object/minimal.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/minimal.cfg.in
+--- nagios-1.3/sample-config/template-object/minimal.cfg.in	2004-11-17 23:40:21.623434872 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/minimal.cfg.in	2004-11-17 23:42:51.449290959 +0100
 @@ -90,7 +90,7 @@
  # Command used to check disk space usage on local partitions
  
@@ -901,9 +907,9 @@
 -
 -
 -# EOF
-diff -urNad nagios-1.2/sample-config/template-object/services.cfg.in /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/services.cfg.in
---- nagios-1.2/sample-config/template-object/services.cfg.in	2004-11-14 00:03:30.645757210 +0100
-+++ /home/joerg/tmp/dpep.x1PFeL/nagios-1.2/sample-config/template-object/services.cfg.in	2004-11-14 00:06:53.672602622 +0100
+diff -urNad nagios-1.3/sample-config/template-object/services.cfg.in /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/services.cfg.in
+--- nagios-1.3/sample-config/template-object/services.cfg.in	2004-11-17 23:40:21.625434549 +0100
++++ /home/joerg/tmp/dpep.PTxLyf/nagios-1.3/sample-config/template-object/services.cfg.in	2004-11-17 23:42:51.451290638 +0100
 @@ -19,15 +19,17 @@
  
  # Generic service definition template

Index: 07_fix_default_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/07_fix_default_config.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 07_fix_default_config.dpatch	13 Nov 2004 23:56:20 -0000	1.2
+++ 07_fix_default_config.dpatch	17 Nov 2004 23:30:08 -0000	1.3
@@ -31,20 +31,6 @@
 diff -urNad nagios-1.2/sample-config/cgi.cfg.in /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/cgi.cfg.in
 --- nagios-1.2/sample-config/cgi.cfg.in	2004-11-14 00:28:52.101014498 +0100
 +++ /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/cgi.cfg.in	2004-11-14 00:28:52.361975758 +0100
-@@ -68,8 +68,12 @@
- # Nagios.  Run the 'ps' command manually to see what the command
- # line entry for the Nagios process looks like.
- 
--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
-+# CGI scripts detect nagios state.
- 
-+nagios_check_command=@libexecdir@/check_nagios @localstatedir@/status.log 5 'nagios'
-+#nagios_check_command=/etc/nagios/check_nagios_db
- 
- 
- # AUTHENTICATION USAGE
 @@ -119,7 +123,7 @@
  # not use authorization.  You may use an asterisk (*) to
  # authorize any user who has authenticated to the web server.