From 1c4844d696b7ab50b8e1337d6d294e75b73189b2 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Mon, 7 Feb 2011 01:31:50 +0100
Subject: fix mail cmd on centos

---
 manifests/defaults/commands.pp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'manifests')

diff --git a/manifests/defaults/commands.pp b/manifests/defaults/commands.pp
index 933f3b9..3c6bc9c 100644
--- a/manifests/defaults/commands.pp
+++ b/manifests/defaults/commands.pp
@@ -118,12 +118,16 @@ class nagios::defaults::commands {
 
     # notification commands
 
+    $mail_cmd_location = $operatingsystem ? {
+      centos => '/bin/mail',
+      default => '/usr/bin/mail'
+    }
+
     nagios_command {
         'notify-host-by-email':
-            command_line => '/usr/bin/printf "%b" "***** Nagios *****\n\nNotification Type: $NOTIFICATIONTYPE$\nHost: $HOSTNAME$\nState: $HOSTSTATE$\nAddress: $HOSTADDRESS$\nInfo: $HOSTOUTPUT$\n\nDate/Time: $LONGDATETIME$\n" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **" $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\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Host Alert: $HOSTNAME$ is $HOSTSTATE$ **\" $CONTACTEMAIL$";
 	    '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$\" | ${mail_cmd_location} -s \"** $NOTIFICATIONTYPE$ Service Alert: $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **\" $CONTACTEMAIL$";
 	}
 
 }
-- 
cgit v1.2.3