[Pkg-nagios-changes] [pkg-nagios] r1255 - nagios2/trunk/debian

Wed Oct 31 13:38:50 UTC 2007

Author: zugschlus
Date: 2007-10-31 13:38:50 +0000 (Wed, 31 Oct 2007)
New Revision: 1255

Modified:
   nagios2/trunk/debian/cfg-cgi.cfg.diff
   nagios2/trunk/debian/cfg-commands.cfg.diff
   nagios2/trunk/debian/cfg-nagios.cfg.diff
   nagios2/trunk/debian/changelog
Log:
  * Adapt sample config patches



Modified: nagios2/trunk/debian/cfg-cgi.cfg.diff
===================================================================

--- nagios2/trunk/debian/cfg-cgi.cfg.diff	2007-10-31 13:27:51 UTC (rev 1254)
+++ nagios2/trunk/debian/cfg-cgi.cfg.diff	2007-10-31 13:38:50 UTC (rev 1255)
@@ -1,9 +1,9 @@
---- sample-config/cgi.cfg	2006-11-28 14:57:00.000000000 +0100
-+++ debian-configs/cgi.cfg	2006-11-28 15:04:15.000000000 +0100
+--- sample-config/cgi.cfg	2007-10-31 14:25:53.000000000 +0100
++++ debian-configs/cgi.cfg	2007-10-31 14:34:20.000000000 +0100
 @@ -1,8 +1,6 @@
  #################################################################
  #
--# CGI.CFG - Sample CGI Configuration File for Nagios 2.9
+-# CGI.CFG - Sample CGI Configuration File for Nagios 2.10
 -#
 -# Last Modified: 11-21-2006
 +# CGI.CFG - CGI Configuration File for Nagios 

Modified: nagios2/trunk/debian/cfg-commands.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-commands.cfg.diff	2007-10-31 13:27:51 UTC (rev 1254)
+++ nagios2/trunk/debian/cfg-commands.cfg.diff	2007-10-31 13:38:50 UTC (rev 1255)
@@ -1,8 +1,8 @@
---- sample-config/template-object/commands.cfg	2006-12-15 13:01:50.000000000 +0100
-+++ debian-configs/commands.cfg	2006-12-15 13:02:21.000000000 +0100
+--- sample-config/template-object/commands.cfg	2007-10-31 14:25:53.000000000 +0100
++++ debian-configs/commands.cfg	2007-10-31 14:34:20.000000000 +0100
 @@ -1,12 +1,5 @@
  ################################################################################
--# Sample command definitions for Nagios 2.9
+-# Sample command definitions for Nagios 2.10
 -#
 -# Read the documentation for more information on this configuration file.  I've
 -# provided some comments here, but things may not be so clear without further
@@ -180,7 +180,7 @@
  # 'host-notify-by-email' command definition
  define command{
  	command_name	host-notify-by-email
--	command_line	/usr/bin/printf "%b" "***** Nagios 2.9 *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
+-	command_line	/usr/bin/printf "%b" "***** Nagios 2.10 *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
 +	command_line    /usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTALIAS$\nState: $HOSTSTATE$ for $HOSTDURATION$\nAddress: $HOSTADDRESS$\nInfo:\n\n$HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n\nACK by: $HOSTACKAUTHOR$\nComment: $HOSTACKCOMMENT$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert $NOTIFICATIONNUMBER$ - $HOSTALIAS$ host is $HOSTSTATE$ **" $CONTACTEMAIL$
  	}
  
@@ -189,7 +189,7 @@
  # 'notify-by-email' command definition
  define command{
  	command_name	notify-by-email
--	command_line	/usr/bin/printf "%b" "***** Nagios 2.9 *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+-	command_line	/usr/bin/printf "%b" "***** Nagios 2.10 *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
 +	command_line    /usr/bin/printf "%b" "***** Nagios  *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nState: $SERVICESTATE$ for $SERVICEDURATION$\nAddress: $HOSTADDRESS$\n\nInfo:\n\n$SERVICEOUTPUT$\n\nDate/Time: $LONGDATETIME$\n\nACK by: $SERVICEACKAUTHOR$\nComment: $SERVICEACKCOMMENT$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert $NOTIFICATIONNUMBER$ - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
  	}
  

Modified: nagios2/trunk/debian/cfg-nagios.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-nagios.cfg.diff	2007-10-31 13:27:51 UTC (rev 1254)
+++ nagios2/trunk/debian/cfg-nagios.cfg.diff	2007-10-31 13:38:50 UTC (rev 1255)
@@ -1,9 +1,9 @@
---- sample-config/nagios.cfg	2006-12-06 10:23:50.000000000 +0100
-+++ debian-configs/nagios.cfg	2006-12-06 10:26:11.000000000 +0100
+--- sample-config/nagios.cfg	2007-10-31 14:25:53.000000000 +0100
++++ debian-configs/nagios.cfg	2007-10-31 14:34:20.000000000 +0100
 @@ -1,12 +1,6 @@
  ##############################################################################
  #
--# NAGIOS.CFG - Sample Main Config File for Nagios 2.9
+-# NAGIOS.CFG - Sample Main Config File for Nagios 2.10
 -#
 -# Read the documentation for more information on this configuration
 -# file.  I've provided some comments here, but things may not be so
@@ -75,7 +75,7 @@
  
  command_file=/var/lib/nagios2/rw/nagios.cmd
  
-@@ -188,7 +193,7 @@
+@@ -198,7 +203,7 @@
  # is created, used, and deleted throughout the time that Nagios is
  # running.
  
@@ -84,7 +84,7 @@
  
  
  
-@@ -235,7 +240,7 @@
+@@ -245,7 +250,7 @@
  # This is the directory where archived (rotated) log files should be 
  # placed (assuming you've chosen to do log rotation).
  
@@ -93,7 +93,7 @@
  
  
  
-@@ -847,7 +852,7 @@
+@@ -866,7 +871,7 @@
  #	strict-iso8601	(YYYY-MM-DDTHH:MM:SS)
  #
  
@@ -102,7 +102,7 @@
  
  
  
-@@ -856,7 +861,7 @@
+@@ -875,7 +880,7 @@
  # embedded Perl interpreter) is located.  If you didn't compile
  # Nagios with embedded Perl support, this option has no effect.
  
@@ -111,7 +111,7 @@
  
  
  
-@@ -920,7 +925,7 @@
+@@ -939,7 +944,7 @@
  # you can access this value by using the $ADMINEMAIL$ macro in your
  # notification commands.
  
@@ -120,7 +120,7 @@
  
  
  
-@@ -930,7 +935,7 @@
+@@ -949,7 +954,7 @@
  # value by using the $ADMINPAGER$ macro in your notification
  # commands.
  

Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2007-10-31 13:27:51 UTC (rev 1254)
+++ nagios2/trunk/debian/changelog	2007-10-31 13:38:50 UTC (rev 1255)
@@ -3,6 +3,7 @@
   * NOT RELEASED YET
   * New upstream release
     * Fix XSS vulnerability (CVS-2007-5624). Closes: #448371
+  * Adapt sample config patches
   * Fix permissions on /var/log/nagios2/archives.
     Thanks to Michael Feger. Closes: #429820
   * Fix typo in localhost_nagios2.cfg.
@@ -19,7 +20,7 @@
   * fixed README.Debian about setting check_external_commands=1
     (closes: #431953).
 
- -- Marc Haber <mh+debian-packages at zugschlus.de>  Wed, 31 Oct 2007 14:26:18 +0100
+ -- Marc Haber <mh+debian-packages at zugschlus.de>  Wed, 31 Oct 2007 14:37:25 +0100
 
 nagios2 (2.9-1) unstable; urgency=low
 


