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

Marc Haber zugschlus at alioth.debian.org
Sat Mar 15 08:26:08 UTC 2008 

Author: zugschlus
Date: 2008-03-15 08:26:08 +0000 (Sat, 15 Mar 2008)
New Revision: 1386

Modified:
   nagios2/trunk/debian/cfg-cgi.cfg.diff
   nagios2/trunk/debian/cfg-commands.cfg.diff
   nagios2/trunk/debian/cfg-nagios.cfg.diff
Log:
adapt to nagios 2.11


Modified: nagios2/trunk/debian/cfg-cgi.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-cgi.cfg.diff	2008-03-15 08:08:26 UTC (rev 1385)
+++ nagios2/trunk/debian/cfg-cgi.cfg.diff	2008-03-15 08:26:08 UTC (rev 1386)
@@ -1,12 +1,12 @@
---- sample-config/cgi.cfg	2007-10-31 14:25:53.000000000 +0100
-+++ debian-configs/cgi.cfg	2007-10-31 14:34:20.000000000 +0100
+--- sample-config/cgi.cfg	2008-03-15 09:11:08.000000000 +0100
++++ debian-configs/cgi.cfg	2008-03-15 09:24:39.000000000 +0100
 @@ -1,8 +1,6 @@
  #################################################################
  #
--# CGI.CFG - Sample CGI Configuration File for Nagios 2.10
+-# CGI.CFG - Sample CGI Configuration File for Nagios 2.11
 -#
 -# Last Modified: 11-21-2006
-+# CGI.CFG - CGI Configuration File for Nagios 
++# CGI.CFG - Sample CGI Configuration File for Nagios
  #
  #################################################################
  

Modified: nagios2/trunk/debian/cfg-commands.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-commands.cfg.diff	2008-03-15 08:08:26 UTC (rev 1385)
+++ nagios2/trunk/debian/cfg-commands.cfg.diff	2008-03-15 08:26:08 UTC (rev 1386)
@@ -1,8 +1,8 @@
---- 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
+--- sample-config/template-object/commands.cfg	2008-03-15 09:11:08.000000000 +0100
++++ debian-configs/commands.cfg	2008-03-15 09:24:39.000000000 +0100
 @@ -1,12 +1,5 @@
  ################################################################################
--# Sample command definitions for Nagios 2.10
+-# Sample command definitions for Nagios 2.11
 -#
 -# 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,8 +180,8 @@
  # 'host-notify-by-email' command definition
  define command{
  	command_name	host-notify-by-email
--	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$
+-	command_line	/usr/bin/printf "%b" "***** Nagios 2.11 *****\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: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /bin/mail -s "Host $HOSTSTATE$ alert for $HOSTNAME$!" $CONTACTEMAIL$
  	}
  
  
@@ -189,8 +189,8 @@
  # 'notify-by-email' command definition
  define command{
  	command_name	notify-by-email
--	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$
+-	command_line	/usr/bin/printf "%b" "***** Nagios 2.11 *****\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$\nAddress: $HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /bin/mail -s "** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
  	}
  
  

Modified: nagios2/trunk/debian/cfg-nagios.cfg.diff
===================================================================
--- nagios2/trunk/debian/cfg-nagios.cfg.diff	2008-03-15 08:08:26 UTC (rev 1385)
+++ nagios2/trunk/debian/cfg-nagios.cfg.diff	2008-03-15 08:26:08 UTC (rev 1386)
@@ -1,19 +1,18 @@
---- 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 @@
- ##############################################################################
+--- sample-config/nagios.cfg	2008-03-15 09:11:08.000000000 +0100
++++ debian-configs/nagios.cfg	2008-03-15 09:24:39.000000000 +0100
+@@ -2,12 +2,6 @@
  #
--# NAGIOS.CFG - Sample Main Config File for Nagios 2.10
--#
+ # NAGIOS.CFG - Sample Main Config File for Nagios 2.11
+ #
 -# 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: 12-21-2006
-+# NAGIOS.CFG - Main Config File for Nagios
- #
+-#
  ##############################################################################
  
+ 
 @@ -16,7 +10,7 @@
  # for historical purposes.  This should be the first option specified 
  # in the config file!!!

More information about the Pkg-nagios-changes mailing list