X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/239e985785bf89571d6c0e6a39473861cd065d2a..78a1ea04a1b870bf93856e3bca38e9e6287b9478:/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 6c9113968..92c96feb3 100644
--- 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
 
-# Load supporting code for report handlers
-
-require "/etc/chef/report"
-
 # Log at level info
 
 log_level :info
@@ -29,15 +25,27 @@ ssl_verify_mode :verify_peer
 
 chef_server_url "https://chef.openstreetmap.org"
 
-# Create report handler
+# Make our plugins visible to ohai
 
-email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
+Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
 
-# Configure report handlers
+begin
 
-exception_handlers << email_handler
-report_handlers << email_handler
+  # Load supporting code for report handlers
 
-# Make our plugins visible to ohai
+  require "/etc/chef/report"
+
+  # Create report handler
+
+  email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
+
+  # Configure report handlers
+
+  exception_handlers << email_handler
+  report_handlers << email_handler
+
+rescue
+
+  # Ignore errors in case required gems not installed yet
 
-Ohai::Config[:plugin_path] << "/etc/chef/ohai"
+end