Use osmosis 0.47.4 for hourly and daily replication

[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..094340f160d8967ac47dbfec386ed16bcc822181 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -17,6 +17,10 @@ log_level :info
 
 log_location "/var/log/chef/client.log"
 
 
 log_location "/var/log/chef/client.log"
 

+# Set the node name
+
+node_name "<%= node.name %>"
+

 # Verify SSL certificates
 
 ssl_verify_mode :verify_peer
 # Verify SSL certificates
 
 ssl_verify_mode :verify_peer


@@ -29,6 +33,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"