[Pkg-nagios-devel] nagios/patches 07_fix_default_config.dpatch,1.4,1.5

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

Modified Files:
	07_fix_default_config.dpatch 
Log Message:
time to start using cfg_dir instead of update-nagios


Index: 07_fix_default_config.dpatch
===================================================================
RCS file: /cvsroot/pkg-nagios/nagios/patches/07_fix_default_config.dpatch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

--- 07_fix_default_config.dpatch	18 Jan 2005 07:17:09 -0000	1.4
+++ 07_fix_default_config.dpatch	24 Feb 2005 01:30:39 -0000	1.5
@@ -7,9 +7,9 @@
 ## DP: sed in debian/rules to this dpatch.
 
 @DPATCH@
-diff -urNad nagios-1.3-cvs.20050116/common/locations.h.in /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/common/locations.h.in
---- nagios-1.3-cvs.20050116/common/locations.h.in	2005-01-16 20:08:23.000000000 -0500
-+++ /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/common/locations.h.in	2005-01-18 01:57:14.000000000 -0500
+diff -urNad nagios-1.3-cvs.20050116/common/locations.h.in /home/seanius/tmp/dpep.mXjUwl/nagios-1.3-cvs.20050116/common/locations.h.in
+--- nagios-1.3-cvs.20050116/common/locations.h.in	2005-02-23 20:20:58.936806458 -0500
++++ /home/seanius/tmp/dpep.mXjUwl/nagios-1.3-cvs.20050116/common/locations.h.in	2005-02-23 20:20:59.544688472 -0500
 @@ -19,14 +19,14 @@
   * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
   ************************************************************************/
@@ -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.3-cvs.20050116/sample-config/cgi.cfg.in /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in
---- nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in	2005-01-18 01:57:13.000000000 -0500
-+++ /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in	2005-01-18 02:04:07.000000000 -0500
+diff -urNad nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in /home/seanius/tmp/dpep.mXjUwl/nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in
+--- nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in	2005-02-23 20:20:59.207753866 -0500
++++ /home/seanius/tmp/dpep.mXjUwl/nagios-1.3-cvs.20050116/sample-config/cgi.cfg.in	2005-02-23 20:20:59.544688472 -0500
 @@ -125,7 +125,7 @@
  # not use authorization.  You may use an asterisk (*) to
  # authorize any user who has authenticated to the web server.
@@ -183,25 +183,23 @@
  
  
  # STATUSMAP BACKGROUND IMAGE
-diff -urNad nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in
---- nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in	2005-01-16 20:08:23.000000000 -0500
-+++ /home/seanius/tmp/dpep.9CHfzo/nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in	2005-01-18 01:57:14.000000000 -0500
-@@ -36,6 +36,14 @@
+diff -urNad nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in /home/seanius/tmp/dpep.mXjUwl/nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in
+--- nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in	2005-02-23 20:20:58.938806070 -0500
++++ /home/seanius/tmp/dpep.mXjUwl/nagios-1.3-cvs.20050116/sample-config/nagios.cfg.in	2005-02-23 20:25:28.287643576 -0500
+@@ -36,6 +36,12 @@
  # plugin release rather than the one provided with Nagios.
  cfg_file=@sysconfdir@/checkcommands.cfg
  
-+# 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=/var/cache/nagios/plugins-auto.cfg
-+
++# Nagios comes with support for a cfg_dir, a directory in which all
++# files ending in .cfg are parsed as configuration files.  This is
++# now the default behavior of nagois wrt the many checkcommand plugins
++# provided by nagios-plugins.
++cfg_dir=/etc/nagios-plugins/config/
 +
  # Misc commands (notification and event handler commands, etc)
  cfg_file=@sysconfdir@/misccommands.cfg
  
-@@ -132,7 +140,7 @@
+@@ -132,7 +138,7 @@
  # directory level instead of on the file, as the file is deleted every
  # time its contents are processed.
  
@@ -210,7 +208,7 @@
  
  
  
-@@ -166,7 +174,7 @@
+@@ -166,7 +172,7 @@
  # is created, used, and deleted throughout the time that Nagios is
  # running.
  
@@ -219,7 +217,7 @@
  
  
  
-@@ -380,7 +388,7 @@
+@@ -380,7 +386,7 @@
  # This file is used only if the preserve_state_information
  # variable is set to 1.
  



