From: Alex Dehnert <adehnert@mit.edu>
Date: Sun, 26 Aug 2012 21:02:14 +0000 (-0400)
Subject: Upstream updates (Lucid->Precise upgrade)
X-Git-Url: https://dehnerts.com/gitweb/?a=commitdiff_plain;h=0080ce7b6cdd6b3aabad753759f66d0d1e6ed58a;p=sysconfig%2Fnagios3.git

Upstream updates (Lucid->Precise upgrade)
---

diff --git a/commands.cfg b/commands.cfg
index 4698058..6b23217 100644
--- a/commands.cfg
+++ b/commands.cfg
@@ -17,7 +17,7 @@ define command{
 # 'notify-service-by-email' command definition
 define command{
 	command_name	notify-service-by-email
-	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$" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Service 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$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
 	}
 
 
diff --git a/nagios.cfg b/nagios.cfg
index 4932457..0abfe8f 100644
--- a/nagios.cfg
+++ b/nagios.cfg
@@ -641,7 +641,7 @@ retain_state_information=1
 # service state information before it shuts down.  The state 
 # information in this file is also read immediately prior to
 # starting to monitor the network when Nagios is restarted.
-# This file is used only if the preserve_state_information
+# This file is used only if the retain_state_information
 # variable is set to 1.
 
 state_retention_file=/var/lib/nagios3/retention.dat