Include WB items in regular search results by dflt

[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 52cbbdf017c08b8ff5308231be6814d2db098a15..2af462bf93f2e80a37ec24e7ac913a8397a083df 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -23,29 +23,21 @@ 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"

 
 # Make our plugins visible to ohai
 
 
 # Make our plugins visible to ohai
 

-Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
+ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>"

 
 

-begin
+# Load supporting code for report handlers

 
 

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

 
 

-  require "/etc/chef/report"
+# Create report handler

 
 

-  # Create report handler
+email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetmap@firefishy.com"])

 
 

-  email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
+# Configure report handlers

 
 

-  # Configure report handlers
-
-  exception_handlers << email_handler
-  report_handlers << email_handler
-
-rescue LoadError
-
-  # Ignore errors in case required gems not installed yet
-
-end
+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