packages: nagios/config.patch - update configdir

[glen]

Author: glen                         Date: Mon Aug  3 16:43:47 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update configdir

---- Files affected:
packages/nagios:
   config.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/nagios/config.patch
diff -u packages/nagios/config.patch:1.2 packages/nagios/config.patch:1.3
--- packages/nagios/config.patch:1.2	Mon Aug  3 17:54:48 2009
+++ packages/nagios/config.patch	Mon Aug  3 18:43:41 2009
@@ -48,7 +48,7 @@
  #
  # You can define $USERx$ macros in this file, which can in turn be used
  # in command definitions in your host config file(s).  $USERx$ macros are
---- nagios-3.1.2/sample-config/nagios.cfg.in~	2009-08-03 18:45:46.405840760 +0300
+--- nagios-3.1.2/sample-config/nagios.cfg.in	2009-08-03 18:45:46.405840760 +0300
 +++ nagios-3.1.2/sample-config/nagios.cfg.in	2009-08-03 18:45:46.405840760 +0300
 @@ -1,13 +1,11 @@
  ##############################################################################
@@ -74,18 +74,42 @@
  
  
  
-@@ -49,6 +47,10 @@
+@@ -27,13 +25,13 @@
+ # if you wish (as shown below), or keep them all in a single config file.
+ 
+ # You can specify individual object config files as shown below:
+-cfg_file=@sysconfdir@/objects/commands.cfg
+-cfg_file=@sysconfdir@/objects/contacts.cfg
+-cfg_file=@sysconfdir@/objects/timeperiods.cfg
+-cfg_file=@sysconfdir@/objects/templates.cfg
++cfg_file=@sysconfdir@/commands.cfg
++cfg_file=@sysconfdir@/contacts.cfg
++cfg_file=@sysconfdir@/timeperiods.cfg
++cfg_file=@sysconfdir@/templates.cfg
+ 
+ # Definitions for monitoring the local (Linux) host
+-cfg_file=@sysconfdir@/objects/localhost.cfg
++#cfg_file=@sysconfdir@/objects/localhost.cfg
+ 
+ # Definitions for monitoring a Windows machine
+ #cfg_file=@sysconfdir@/objects/windows.cfg
+@@ -48,13 +46,8 @@
+ # You can also tell Nagios to process all config files (with a .cfg
  # extension) in a particular directory by using the cfg_dir
  # directive as shown below:
+-
+-#cfg_dir=@sysconfdir@/servers
+-#cfg_dir=@sysconfdir@/printers
+-#cfg_dir=@sysconfdir@/switches
+-#cfg_dir=@sysconfdir@/routers
+-
+-
++cfg_dir=@sysconfdir@/plugins
++cfg_dir=@sysconfdir@/objects
+ 
  
-+cfg_dir=/etc/nagios/plugins
-+cfg_dir=/etc/nagios/local
-+#cfg_dir=etc/nagios/objects
-+
- #cfg_dir=@sysconfdir@/servers
- #cfg_dir=@sysconfdir@/printers
- #cfg_dir=@sysconfdir@/switches
-@@ -264,7 +266,7 @@
+ # OBJECT CACHE FILE
+@@ -264,7 +257,7 @@
  # This is the directory where archived (rotated) log files should be
  # placed (assuming you've chosen to do log rotation).
  
@@ -94,7 +118,7 @@
  
  
  
-@@ -850,8 +852,8 @@
+@@ -850,8 +843,8 @@
  # Performance data is only written to these files if the
  # enable_performance_data option (above) is set to 1.
  
@@ -105,7 +129,7 @@
  
  
  
-@@ -1065,7 +1067,7 @@
+@@ -1065,7 +1058,7 @@
  #	strict-iso8601	(YYYY-MM-DDTHH:MM:SS)
  #
  
@@ -114,7 +138,7 @@
  
  
  
-@@ -1306,7 +1308,7 @@
+@@ -1306,7 +1299,7 @@
  # DEBUG FILE
  # This option determines where Nagios should write debugging information.
  
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios/config.patch?r1=1.2&r2=1.3&f=u