X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cdf484bab903aac4cb5bae20bfaa8bef187e17c9..0d3914cdadb7d61b06c5553f6a1d2937a23820a4:/cookbooks/chef/templates/default/client.rb.erb

diff --git a/cookbooks/chef/templates/default/client.rb.erb b/cookbooks/chef/templates/default/client.rb.erb
index 6b7234955..5d1f46393 100644
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -17,6 +17,10 @@ log_level :info
 
 log_location "/var/log/chef/client.log"
 
+# Set the node name
+
+node_name "<%= node.name %>"
+
 # Verify SSL certificates
 
 ssl_verify_mode :verify_peer
@@ -39,4 +43,5 @@ email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetma
 
 # Configure report handlers
 
-report_handlers << email_handler
+exception_handlers.delete_if { |h| h.is_a?(Chef::Handler::Email) } << email_handler
+report_handlers.delete_if { |h| h.is_a?(Chef::Handler::Email) } << email_handler