Delete any existing report handler before installing a new one

[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 f151c7d0760a31ef947315b49855ea940c6be2fb..2af462bf93f2e80a37ec24e7ac913a8397a083df 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -27,7 +27,7 @@ chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap"
 
 # Make our plugins visible to ohai
 
-Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
+ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>"
 
 # Load supporting code for report handlers
 
@@ -39,5 +39,5 @@ email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetma
 
 # Configure report handlers
 
-exception_handlers << email_handler
-report_handlers << email_handler
+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