[Pkg-nagios-changes] [pkg-nagios] r1407 - nagios3/trunk/debian

[Alexander Wirt]

Author: formorer
Date: 2008-04-08 18:35:12 +0000 (Tue, 08 Apr 2008)
New Revision: 1407

Modified:
   nagios3/trunk/debian/cfg-nagios.cfg.diff
Log:
- Update to 3.0.1 
- Move conf.d/ to the end of nagios.cfg so every configoption can 
  be overwritten in conf.d/


Modified: nagios3/trunk/debian/cfg-nagios.cfg.diff
===================================================================
--- nagios3/trunk/debian/cfg-nagios.cfg.diff	2008-04-08 17:37:56 UTC (rev 1406)
+++ nagios3/trunk/debian/cfg-nagios.cfg.diff	2008-04-08 18:35:12 UTC (rev 1407)
@@ -1,8 +1,8 @@
---- nagios.cfg.orig	2008-02-06 18:04:46.000000000 +0100
-+++ nagios.cfg	2008-02-06 19:23:36.000000000 +0100
+--- nagios.cfg.orig	2008-04-08 19:53:14.000000000 +0200
++++ nagios.cfg	2008-04-08 20:24:38.000000000 +0200
 @@ -2,12 +2,6 @@
  #
- # NAGIOS.CFG - Sample Main Config File for Nagios 3.0rc2
+ # NAGIOS.CFG - Sample Main Config File for Nagios 3.0.1
  #
 -# Read the documentation for more information on this configuration
 -# file.  I've provided some comments here, but things may not be so
@@ -13,18 +13,13 @@
  ##############################################################################
  
  
-@@ -16,8 +10,19 @@
+@@ -16,8 +10,14 @@
  # for historical purposes.  This should be the first option specified 
  # in the config file!!!
  
 -log_file=/var/lib/nagios3/nagios.log
 +log_file=/var/log/nagios3/nagios.log
  
-+# Debian uses by default a configuration directory where nagios3-common,
-+# other packages and the local admin can dump or link configuration
-+# files into.
-+cfg_dir=/etc/nagios3/conf.d
-+
 +# Commands definitions
 +cfg_file=/etc/nagios3/commands.cfg
 +
@@ -34,7 +29,7 @@
  
  
  # OBJECT CONFIGURATION FILE(S)
-@@ -27,13 +32,11 @@
+@@ -27,13 +27,11 @@
  # 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:
@@ -52,7 +47,7 @@
  
  # Definitions for monitoring a Windows machine
  #cfg_file=/etc/nagios3/objects/windows.cfg
-@@ -64,7 +67,7 @@
+@@ -64,7 +62,7 @@
  # directly) in order to prevent inconsistencies that can occur
  # when the config files are modified after Nagios starts.
  
@@ -61,7 +56,7 @@
  
  
  
-@@ -80,7 +83,7 @@
+@@ -80,7 +78,7 @@
  # Read the documentation section on optimizing Nagios to find our more
  # about how this feature works.
  
@@ -70,7 +65,7 @@
  
  
  
-@@ -103,7 +106,7 @@
+@@ -103,7 +101,7 @@
  # The contents of the status file are deleted every time Nagios
  #  restarts.
  
@@ -79,7 +74,7 @@
  
  
  
-@@ -169,6 +172,8 @@
+@@ -169,6 +167,8 @@
  # is running as (usually 'nobody').  Permissions should be set at the 
  # directory level instead of on the file, as the file is deleted every
  # time its contents are processed.
@@ -88,7 +83,7 @@
  
  command_file=/var/lib/nagios3/rw/nagios.cmd
  
-@@ -198,7 +203,7 @@
+@@ -198,7 +198,7 @@
  # is created, used, and deleted throughout the time that Nagios is
  # running.
  
@@ -97,7 +92,7 @@
  
  
  
-@@ -264,7 +269,7 @@
+@@ -264,7 +264,7 @@
  # This is the directory where archived (rotated) log files should be 
  # placed (assuming you've chosen to do log rotation).
  
@@ -106,7 +101,7 @@
  
  
  
-@@ -1051,7 +1056,7 @@
+@@ -1051,7 +1051,7 @@
  #	strict-iso8601	(YYYY-MM-DDTHH:MM:SS)
  #
  
@@ -115,7 +110,7 @@
  
  
  
-@@ -1081,7 +1086,7 @@
+@@ -1081,7 +1081,7 @@
  # embedded Perl interpreter) is located.  If you didn't compile
  # Nagios with embedded Perl support, this option has no effect.
  
@@ -124,7 +119,7 @@
  
  
  
-@@ -1165,8 +1170,8 @@
+@@ -1165,8 +1165,8 @@
  # using the $ADMINEMAIL$ and $ADMINPAGER$ macros in your notification
  # commands.
  
@@ -135,3 +130,13 @@
  
  
  
+@@ -1281,4 +1281,9 @@
+ 
+ max_debug_file_size=1000000
+ 
++# Debian uses by default a configuration directory where nagios3-common,
++# other packages and the local admin can dump or link configuration
++# files into.
++cfg_dir=/etc/nagios3/conf.d
++
+