community: Enable new IPv6 template

[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 518ec13837734ef1d5ea998876479cda9b46e9e3..4265d0660cb18412a5070ee8ee44152cb024210f 100644 (file)
--- a/cookbooks/chef/templates/default/report.rb.erb
+++ b/cookbooks/chef/templates/default/report.rb.erb
@@ -14,25 +14,32 @@ class Chef
       end
 
       def report
       end
 
       def report

+        from_address = @config[:from]
+        to_address = @config[:to]
+

         if failed? && !exception.is_a?(SystemExit)
         if failed? && !exception.is_a?(SystemExit)

-          subject = "Chef run failed on #{node.name}"
-          message = "#{run_status.formatted_exception}\n"
+          message_subject = "Chef run failed on #{node.name}"
+          message_body = "#{run_status.formatted_exception}\n"

         elsif elapsed_time > 600
         elsif elapsed_time > 600

-          subject = "Chef run took #{elapsed_time} on #{node.name}"
-          message = ""
+          message_subject = "Chef run took #{elapsed_time} on #{node.name}"
+          message_body = ""

         end
 
         end
 

-        return unless subject
+        return unless message_subject

 
 

-        message << Array(backtrace).join("\n")
+        message_body << Array(backtrace).join("\n")

 
         require "mail"
 
 
         require "mail"
 

+        Mail.defaults do
+          delivery_method :exim, :location => "/usr/sbin/exim"
+        end
+

         Mail.deliver do
         Mail.deliver do

-          to @config[:to]
-          from @config[:from]
-          subject subject
-          body message
+          to to_address
+          from from_address
+          subject message_subject
+          body message_body

         end
       end
     end
         end
       end
     end