Upstream updates (Lucid->Precise upgrade)

diff --git a/commands.cfg b/commands.cfg
index 4698058576f19886d06fdd36b0ab9f521d7b9bcb..6b232170739693b60f1c46fb747b626bb76e0166 100644 (file)
--- 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 493245798fdf3040a666697c44e7cf969d1a61d2..0abfe8fa67a7a2a34c156f1f9b2bacbd56e761bd 100644 (file)
--- 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