Revert "Disable OAuth 1.0a and basic authentication"

[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 2af462bf93f2e80a37ec24e7ac913a8397a083df..6faa7384b5164c819b0cfde8c597ef2fa0e8c355 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,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