X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/61f7c7cfb02e73a87fc15a468f8119678c36e3d3..b7c12630cb9de017d76fe60ff296534d6d061399:/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 b78fefb6a..6faa7384b 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 @@ -25,9 +33,9 @@ ssl_verify_mode :verify_peer chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap" -# Make our plugins visible to ohai +# Enable some optional ohai plugins -ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>" +ohai.optional_plugins = %w[Passwd] # Load supporting code for report handlers @@ -39,5 +47,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