Improve detection of unassigned drives on HP controllers

[chef.git] / cookbooks / chef / templates / default / report.rb.erb

diff --git a/cookbooks/chef/templates/default/report.rb.erb b/cookbooks/chef/templates/default/report.rb.erb
index 07a8753a8a4b4ed0bc0366f6111bf754d8e9d0fd..4265d0660cb18412a5070ee8ee44152cb024210f 100644 (file)
--- a/cookbooks/chef/templates/default/report.rb.erb
+++ b/cookbooks/chef/templates/default/report.rb.erb
@@ -20,9 +20,9 @@ class Chef
         if failed? && !exception.is_a?(SystemExit)
           message_subject = "Chef run failed on #{node.name}"
           message_body = "#{run_status.formatted_exception}\n"
-#        elsif elapsed_time > 600
-#          message_subject = "Chef run took #{elapsed_time} on #{node.name}"
-#          message_body = ""
+        elsif elapsed_time > 600
+          message_subject = "Chef run took #{elapsed_time} on #{node.name}"
+          message_body = ""
         end
 
         return unless message_subject
@@ -31,6 +31,10 @@ class Chef
 
         require "mail"
 
+        Mail.defaults do
+          delivery_method :exim, :location => "/usr/sbin/exim"
+        end
+
         Mail.deliver do
           to to_address
           from from_address