Make sure a full set of locales are installed

[chef.git] / 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 65bf700e8dbe4a56880e037c55fe40074016bca5..5d1f463930de23870f0273116e749d3218690e62 100644 (file)
--- 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,5 +43,5 @@ email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetma
 
 # Configure report handlers
 
-exception_handlers << email_handler
-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