Update chef client to 15.10.12

[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 92c96feb3ad61ca9e70900a1d220eff1e211e31e..796b276c57e1704dcf2dc5947d0cff4576456c01 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -9,6 +9,10 @@
 
 Encoding.default_external = Encoding::UTF_8
 
+# Accept the license
+
+chef_license "accept"
+
 # Log at level info
 
 log_level :info
@@ -17,35 +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"
 
 # Make our plugins visible to ohai
 
-Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
-
-begin
-
-  # Load supporting code for report handlers
+ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>"
 
-  require "/etc/chef/report"
+# Enable some optional ohai plugins
 
-  # Create report handler
+ohai.optional_plugins = %w[Passwd]
 
-  email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
+# Load supporting code for report handlers
 
-  # Configure report handlers
+require "/etc/chef/report"
 
-  exception_handlers << email_handler
-  report_handlers << email_handler
+# Create report handler
 
-rescue
+email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetmap@firefishy.com"])
 
-  # Ignore errors in case required gems not installed yet
+# Configure report handlers
 
-end
+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