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

[Sean Finney]

Author: seanius
Date: 2007-06-02 15:18:11 +0000 (Sat, 02 Jun 2007)
New Revision: 1172

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:
merge config diffs

Modified: nagios2/trunk/debian/cfg-cgi.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-cgi.cfg.diff	2007-05-28 17:53:38 UTC (rev 1171)
+++ nagios2/trunk/debian/cfg-cgi.cfg.diff	2007-06-02 15:18:11 UTC (rev 1172)
@@ -3,7 +3,7 @@
 @@ -1,8 +1,6 @@
  #################################################################
  #
--# CGI.CFG - Sample CGI Configuration File for Nagios 2.6
+-# CGI.CFG - Sample CGI Configuration File for Nagios 2.9
 -#
 -# 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-05-28 17:53:38 UTC (rev 1171)
+++ nagios2/trunk/debian/cfg-commands.cfg.diff	2007-06-02 15:18:11 UTC (rev 1172)
@@ -2,7 +2,7 @@
 +++ debian-configs/commands.cfg	2006-12-15 13:02:21.000000000 +0100
 @@ -1,12 +1,5 @@
  ################################################################################
--# Sample command definitions for Nagios 2.6
+-# Sample command definitions for Nagios 2.9
 -#
 -# 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.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
+-	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 *****\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.6 *****\n\nNotification Type: $NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+-	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  *****\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-05-28 17:53:38 UTC (rev 1171)
+++ nagios2/trunk/debian/cfg-nagios.cfg.diff	2007-06-02 15:18:11 UTC (rev 1172)
@@ -3,13 +3,13 @@
 @@ -1,12 +1,6 @@
  ##############################################################################
  #
--# NAGIOS.CFG - Sample Main Config File for Nagios 2.6
+-# NAGIOS.CFG - Sample Main Config File for Nagios 2.9
 -#
 -# 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 explanation.
 -#
--# Last Modified: 11-21-2006
+-# Last Modified: 12-21-2006
 +# NAGIOS.CFG - Main Config File for Nagios
  #
  ##############################################################################

Modified: nagios2/trunk/debian/changelog
===================================================================
--- nagios2/trunk/debian/changelog	2007-05-28 17:53:38 UTC (rev 1171)
+++ nagios2/trunk/debian/changelog	2007-06-02 15:18:11 UTC (rev 1172)
@@ -8,6 +8,7 @@
   [Sean Finney]
   * new upstream contains various fixes in init script 
     (closes: #416763, #397289, #414050, #412980, #415752, 
+  * Merge config file changes.
   * add note for pam_tmpdir users about setting TMPDIR in
     /etc/nagios2/default.  thanks to Richard A Nelson (closes: #414652)