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 c276ed6c071fa1c33b61b13538a1de900ab96735..5d1f463930de23870f0273116e749d3218690e62 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -9,10 +9,6 @@
 
 Encoding.default_external = Encoding::UTF_8
 
-# Load supporting code for report handlers
-
-require "/etc/chef/report"
-
 # Log at level info
 
 log_level :info
@@ -21,23 +17,31 @@ 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
 
 # Set the URL for the chef server
 
-chef_server_url "https://chef.openstreetmap.org"
+chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap"
 
-# Create report handler
+# Make our plugins visible to ohai
 
-email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
+ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>"
 
-# Configure report handlers
+# Load supporting code for report handlers
 
-exception_handlers << email_handler
-report_handlers << email_handler
+require "/etc/chef/report"
 
-# Make our plugins visible to ohai
+# Create report handler
+
+email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetmap@firefishy.com"])
+
+# Configure report handlers
 
-Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
+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