X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c1f1e240baece8f3a3ee1d7139736e4a6a0f027e..aa631a37ed7af957d7b0c6c80b0257c183428132:/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 c276ed6c0..796b276c5 100644
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -9,9 +9,9 @@
 
 Encoding.default_external = Encoding::UTF_8
 
-# Load supporting code for report handlers
+# Accept the license
 
-require "/etc/chef/report"
+chef_license "accept"
 
 # Log at level info
 
@@ -21,23 +21,35 @@ 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
+# Enable some optional ohai plugins
 
-exception_handlers << email_handler
-report_handlers << email_handler
+ohai.optional_plugins = %w[Passwd]
 
-# Make our plugins visible to ohai
+# Load supporting code for report handlers
+
+require "/etc/chef/report"
+
+# 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