X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ac83022b37221af78f5ac2b9f9052e5a7791ee90..5fde77fb90280da2c008bb5e8e83f6635b999715:/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 2af462bf9..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"