[Pkg-nagios-devel] nagios/patches 02_reasonable_config.dpatch,1.1,1.2 07_fix_default_config.dpatch,1.1,1.2 chk-001_config.h-no_defaults,1.1.1.1,NONE chk-006_accept_passive-event_handler-swap,1.1.1.1,NONE chk-007_cosmetic-services,1.1.1.1,NONE

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

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

Modified Files:
	02_reasonable_config.dpatch 07_fix_default_config.dpatch 
Removed Files:
	chk-001_config.h-no_defaults 
	chk-006_accept_passive-event_handler-swap 
	chk-007_cosmetic-services 
Log Message:
Moved templates to nagios-common.templates, deleted unused README.databases and
command.cfg, as well as some unused patches.
Modified a lot to make upgrades working, mark more bugs as closed with this
release.
Updated the debconf translations, some of them are still fuzzy, im waiting for
the translators to sent me an updated version.

Now: This works for me, tested with upgrades from the actual sid/sarge version
to this one, tested with fresh installs. I consider this as a version I can upload,
so if you have anything to add: Do it NOW! :)



Index: 02_reasonable_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/02_reasonable_config.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 02_reasonable_config.dpatch	31 Oct 2004 14:52:45 -0000	1.1
+++ 02_reasonable_config.dpatch	13 Nov 2004 23:56:20 -0000	1.2
@@ -5,9 +5,9 @@
 ## DP: Fix the config.
 
 @DPATCH@
-diff -urNad nagios-1.2/sample-config/cgi.cfg.in nagios-1.2/sample-config/cgi.cfg.in
---- nagios-1.2/sample-config/cgi.cfg.in	2002-10-30 01:05:35.000000000 +0100
-+++ nagios-1.2/sample-config/cgi.cfg.in	2004-10-31 14:10:43.773238243 +0100
+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 @@
  # Nagios.  Run the 'ps' command manually to see what the command
  # line entry for the Nagios process looks like.
@@ -17,9 +17,9 @@
  
  
  
-diff -urNad nagios-1.2/sample-config/template-object/checkcommands.cfg.in nagios-1.2/sample-config/template-object/checkcommands.cfg.in
---- nagios-1.2/sample-config/template-object/checkcommands.cfg.in	2002-06-10 05:25:52.000000000 +0200
-+++ nagios-1.2/sample-config/template-object/checkcommands.cfg.in	2004-10-31 14:10:43.773238243 +0100
+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
 @@ -124,30 +124,30 @@
  	}
  
@@ -59,9 +59,9 @@
  	command_line	$USER1$/check_load -w $ARG1$ -c $ARG2$
  	}
  
-diff -urNad nagios-1.2/sample-config/template-object/contactgroups.cfg.in nagios-1.2/sample-config/template-object/contactgroups.cfg.in
---- nagios-1.2/sample-config/template-object/contactgroups.cfg.in	2002-10-04 02:12:48.000000000 +0200
-+++ nagios-1.2/sample-config/template-object/contactgroups.cfg.in	2004-10-31 14:10:43.773238243 +0100
+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
 @@ -18,35 +18,35 @@
  ################################################################################
  
@@ -134,9 +134,9 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/contacts.cfg.in nagios-1.2/sample-config/template-object/contacts.cfg.in
---- nagios-1.2/sample-config/template-object/contacts.cfg.in	2002-03-08 04:38:36.000000000 +0100
-+++ nagios-1.2/sample-config/template-object/contacts.cfg.in	2004-10-31 14:10:43.773238243 +0100
+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
 @@ -33,16 +33,16 @@
  
  
@@ -165,9 +165,9 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/escalations.cfg.in nagios-1.2/sample-config/template-object/escalations.cfg.in
---- nagios-1.2/sample-config/template-object/escalations.cfg.in	2002-03-08 04:38:36.000000000 +0100
-+++ nagios-1.2/sample-config/template-object/escalations.cfg.in	2004-10-31 14:10:43.776237801 +0100
+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
 @@ -19,24 +19,33 @@
  
  # Serviceescalation definition
@@ -250,9 +250,9 @@
  
  
  
-diff -urNad nagios-1.2/sample-config/template-object/hostgroups.cfg.in nagios-1.2/sample-config/template-object/hostgroups.cfg.in
---- nagios-1.2/sample-config/template-object/hostgroups.cfg.in	2002-03-08 04:38:36.000000000 +0100
-+++ nagios-1.2/sample-config/template-object/hostgroups.cfg.in	2004-10-31 14:10:43.776237801 +0100
+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
 @@ -17,57 +17,67 @@
  #
  ################################################################################
@@ -356,17 +356,15 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/hosts.cfg.in nagios-1.2/sample-config/template-object/hosts.cfg.in
---- nagios-1.2/sample-config/template-object/hosts.cfg.in	2002-03-11 00:49:27.000000000 +0100
-+++ nagios-1.2/sample-config/template-object/hosts.cfg.in	2004-10-31 14:10:43.776237801 +0100
-@@ -20,9 +20,9 @@
- # Generic host definition template
+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
+@@ -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
--	notifications_enabled		1	; Host notifications are enabled
+ 	notifications_enabled		1	; Host notifications are enabled
 -	event_handler_enabled		1	; Host event handler is enabled
 -	flap_detection_enabled		1	; Flap detection is enabled
-+	notifications_enabled		0	; Host notifications are disabled
 +	event_handler_enabled		0	; Host event handler is disabled
 +	flap_detection_enabled		0	; Flap detection is disabled
  	process_perf_data		1	; Process performance data
@@ -789,9 +787,9 @@
 +#	}
  
  
-diff -urNad nagios-1.2/sample-config/template-object/minimal.cfg.in nagios-1.2/sample-config/template-object/minimal.cfg.in
---- nagios-1.2/sample-config/template-object/minimal.cfg.in	2002-10-04 02:12:48.000000000 +0200
-+++ nagios-1.2/sample-config/template-object/minimal.cfg.in	2004-10-31 14:10:43.777237653 +0100
+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
 @@ -90,7 +90,7 @@
  # Command used to check disk space usage on local partitions
  
@@ -903,20 +901,19 @@
 -
 -
 -# EOF
-diff -urNad nagios-1.2/sample-config/template-object/services.cfg.in nagios-1.2/sample-config/template-object/services.cfg.in
---- nagios-1.2/sample-config/template-object/services.cfg.in	2002-09-19 04:15:36.000000000 +0200
-+++ nagios-1.2/sample-config/template-object/services.cfg.in	2004-10-31 14:10:43.778237506 +0100
+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
 @@ -19,15 +19,17 @@
  
  # Generic service definition template
  define service{
 -	name				generic-service	; The 'name' of this service template, referenced in other service definitions
--	active_checks_enabled		1	; Active service checks are enabled
--	passive_checks_enabled		1	; Passive service checks are enabled/accepted
--	parallelize_check		1	; Active service checks should be parallelized (disabling this can lead to major performance problems)
 +	; The 'name' of this service template, referenced in other service definitions
 +	name				generic-service
-+	active_checks_enabled		0	; Active service checks are disabled
+ 	active_checks_enabled		1	; Active service checks are enabled
+-	passive_checks_enabled		1	; Passive service checks are enabled/accepted
+-	parallelize_check		1	; Active service checks should be parallelized (disabling this can lead to major performance problems)
 +	passive_checks_enabled		0	; Passive service checks are enabled/disabled
 +	parallelize_check		1	; Active service checks should be parallelized
 +						; (disabling this can lead to major performance problems)

Index: 07_fix_default_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/07_fix_default_config.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 07_fix_default_config.dpatch	11 Nov 2004 00:01:50 -0000	1.1
+++ 07_fix_default_config.dpatch	13 Nov 2004 23:56:20 -0000	1.2
@@ -7,15 +7,15 @@
 ## DP: sed in debian/rules to this dpatch.
 
 @DPATCH@
-diff -urNad nagios-1.2/common/locations.h.in /home/joerg/tmp/dpep.IWqcHF/nagios-1.2/common/locations.h.in
---- nagios-1.2/common/locations.h.in	2004-11-11 00:22:57.395904252 +0100
-+++ /home/joerg/tmp/dpep.IWqcHF/nagios-1.2/common/locations.h.in	2004-11-11 00:23:13.216578491 +0100
+diff -urNad nagios-1.2/common/locations.h.in /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/common/locations.h.in
+--- nagios-1.2/common/locations.h.in	2004-11-14 00:28:51.830054722 +0100
++++ /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/common/locations.h.in	2004-11-14 00:28:52.360975906 +0100
 @@ -19,14 +19,14 @@
   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   ************************************************************************/
  
 -#define DEFAULT_TEMP_FILE			"@localstatedir@/tempfile"
-+#define DEFAULT_TEMP_FILE			"/var/cache/nagios/tempfile"
++#define DEFAULT_TEMP_FILE			"/var/cache/nagios/nagios.tmp"
  #define DEFAULT_STATUS_FILE			"@localstatedir@/status.log"
  #define DEFAULT_LOG_FILE			"@localstatedir@/nagios.log"
  #define DEFAULT_LOG_ARCHIVE_PATH		"@localstatedir@/archives/"
@@ -28,9 +28,9 @@
  #define DEFAULT_PHYSICAL_HTML_PATH		"@datadir@"
  #define DEFAULT_URL_HTML_PATH			"@htmurl@"
  #define DEFAULT_PHYSICAL_CGIBIN_PATH		"@sbindir@"
-diff -urNad nagios-1.2/sample-config/cgi.cfg.in /home/joerg/tmp/dpep.IWqcHF/nagios-1.2/sample-config/cgi.cfg.in
---- nagios-1.2/sample-config/cgi.cfg.in	2004-11-11 00:23:12.913623028 +0100
-+++ /home/joerg/tmp/dpep.IWqcHF/nagios-1.2/sample-config/cgi.cfg.in	2004-11-11 00:25:05.439078860 +0100
+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.
@@ -50,7 +50,7 @@
  # authorize any user who has authenticated to the web server.
  
 -#authorized_for_system_information=nagiosadmin,theboss,jdoe
-+#authorized_for_system_information=nagiosadmin
++authorized_for_system_information=nagiosadmin
  
  
  
@@ -59,7 +59,16 @@
  # to the web server.
  
 -#authorized_for_configuration_information=nagiosadmin,jdoe
-+#authorized_for_configuration_information=nagiosadmin
++authorized_for_configuration_information=nagiosadmin
+ 
+ 
+ 
+@@ -144,7 +148,7 @@
+ # You may use an asterisk (*) to authorize any user who has
+ # authenticated to the web server.
+ 
+-#authorized_for_system_commands=nagiosadmin
++authorized_for_system_commands=nagiosadmin
  
  
  
@@ -69,29 +78,41 @@
  
 -#authorized_for_all_services=nagiosadmin,guest
 -#authorized_for_all_hosts=nagiosadmin,guest
-+#authorized_for_all_services=nagiosadmin
-+#authorized_for_all_hosts=nagiosadmin
++authorized_for_all_services=nagiosadmin
++authorized_for_all_hosts=nagiosadmin
  
  
  
-diff -urNad nagios-1.2/sample-config/nagios.cfg.in /home/joerg/tmp/dpep.IWqcHF/nagios-1.2/sample-config/nagios.cfg.in
---- nagios-1.2/sample-config/nagios.cfg.in	2004-11-11 00:22:57.396904105 +0100
-+++ /home/joerg/tmp/dpep.IWqcHF/nagios-1.2/sample-config/nagios.cfg.in	2004-11-11 00:23:13.218578197 +0100
-@@ -36,6 +36,13 @@
+@@ -171,8 +175,8 @@
+ # authorization).  You may use an asterisk (*) to authorize any
+ # user who has authenticated to the web server.
+ 
+-#authorized_for_all_service_commands=nagiosadmin
+-#authorized_for_all_host_commands=nagiosadmin
++authorized_for_all_service_commands=nagiosadmin
++authorized_for_all_host_commands=nagiosadmin
+ 
+ 
+ 
+diff -urNad nagios-1.2/sample-config/nagios.cfg.in /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/nagios.cfg.in
+--- nagios-1.2/sample-config/nagios.cfg.in	2004-11-14 00:28:51.831054574 +0100
++++ /home/joerg/tmp/dpep.0MRlFu/nagios-1.2/sample-config/nagios.cfg.in	2004-11-14 00:29:29.529457687 +0100
+@@ -36,6 +36,14 @@
  # plugin release rather than the one provided with Nagios.
  cfg_file=@sysconfdir@/checkcommands.cfg
  
-+# Enable the following line (and disable the above checkcommands line)
-+# to switch to using the automatically generated plugins configuration
-+# file.
++# Enable the following line to switch to using the automatically
++# generated plugins configuration file. Disable the line above if you
++# dont have own commands defined there, or delete all the duplicates
++# in this file or you will run in trouble with the next nagios start!
 +#
-+#cfg_file=@sysconfdir@/plugins-auto.cfg
-+ 
++cfg_file=/var/cache/nagios/plugins-auto.cfg
++
 +
  # Misc commands (notification and event handler commands, etc)
  cfg_file=@sysconfdir@/misccommands.cfg
  
-@@ -132,7 +139,7 @@
+@@ -132,7 +140,7 @@
  # directory level instead of on the file, as the file is deleted every
  # time its contents are processed.
  
@@ -100,7 +121,7 @@
  
  
  
-@@ -166,7 +173,7 @@
+@@ -166,7 +174,7 @@
  # is created, used, and deleted throughout the time that Nagios is
  # running.
  
@@ -109,7 +130,7 @@
  
  
  
-@@ -380,7 +387,7 @@
+@@ -380,7 +388,7 @@
  # This file is used only if the preserve_state_information
  # variable is set to 1.
  

--- chk-001_config.h-no_defaults DELETED ---

--- chk-006_accept_passive-event_handler-swap DELETED ---

--- chk-007_cosmetic-services DELETED ---