X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cdf484bab903aac4cb5bae20bfaa8bef187e17c9..e13f802676279f1237c6811ee9e751829fec11cd:/cookbooks/chef/templates/default/client.rb.erb?ds=sidebyside diff --git a/cookbooks/chef/templates/default/client.rb.erb b/cookbooks/chef/templates/default/client.rb.erb index 6b7234955..796b276c5 100644 --- 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,6 +21,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 @@ -29,6 +37,10 @@ chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap" ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>" +# Enable some optional ohai plugins + +ohai.optional_plugins = %w[Passwd] + # Load supporting code for report handlers require "/etc/chef/report" @@ -39,4 +51,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