Update to chef server 12

[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 92c96feb3ad61ca9e70900a1d220eff1e211e31e..dff9d19ed8dbbb9ce1ef3eb9f3f5143b9b698620 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -29,23 +29,15 @@ chef_server_url "https://chef.openstreetmap.org"
 
 Ohai::Config[: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")
 
-  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
-
-  # Ignore errors in case required gems not installed yet
-
-end
+exception_handlers << email_handler
+report_handlers << email_handler