Merge remote-tracking branch 'github/pull/459'

[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 5d1f463930de23870f0273116e749d3218690e62..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
 
 
 Encoding.default_external = Encoding::UTF_8
 

+# Accept the license
+
+chef_license "accept"
+

 # Log at level info
 
 log_level :info
 # Log at level info
 
 log_level :info


@@ -33,6 +37,10 @@ chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap"
 
 ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>"
 
 
 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"
 # Load supporting code for report handlers
 
 require "/etc/chef/report"