Make sure the Passwd ohai plugin is enabled

[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 e4bba9250e94464f5b536a62df40d824f5d7c2fa..094340f160d8967ac47dbfec386ed16bcc822181 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -9,10 +9,6 @@
 
 Encoding.default_external = Encoding::UTF_8
 
 
 Encoding.default_external = Encoding::UTF_8
 

-# Load supporting code for report handlers
-
-require "/etc/chef/report"
-

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


@@ -21,23 +17,35 @@ log_level :info
 
 log_location "/var/log/chef/client.log"
 
 
 log_location "/var/log/chef/client.log"
 

-# Don't verify SSL certificates
+# Set the node name
+
+node_name "<%= node.name %>"

 
 

-ssl_verify_mode :verify_none
+# Verify SSL certificates
+
+ssl_verify_mode :verify_peer

 
 # Set the URL for the chef server
 
 
 # Set the URL for the chef server
 

-chef_server_url "https://chef.openstreetmap.org"
+chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap"

 
 

-# Create report handler
+# Make our plugins visible to ohai

 
 

-email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
+ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>"

 
 

-# Configure report handlers
+# Enable some optional ohai plugins

 
 

-exception_handlers << email_handler
-report_handlers << email_handler
+ohai.optional_plugins = %w[Passwd]

 
 

-# Make our plugins visible to ohai
+# Load supporting code for report handlers
+
+require "/etc/chef/report"
+
+# Create report handler
+
+email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetmap@firefishy.com"])
+
+# Configure report handlers

 
 

-Ohai::Config[:plugin_path] << "/etc/chef/ohai"
+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