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 c276ed6c071fa1c33b61b13538a1de900ab96735..dff9d19ed8dbbb9ce1ef3eb9f3f5143b9b698620 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
 
-# Load supporting code for report handlers
-
-require "/etc/chef/report"
-
 # Log at level info
 
 log_level :info
@@ -29,6 +25,14 @@ ssl_verify_mode :verify_peer
 
 chef_server_url "https://chef.openstreetmap.org"
 
+# Make our plugins visible to ohai
+
+Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
+
+# Load supporting code for report handlers
+
+require "/etc/chef/report"
+
 # Create report handler
 
 email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
@@ -37,7 +41,3 @@ email_handler = Chef::Handler::Email.new(:to => "tom@compton.nu")
 
 exception_handlers << email_handler
 report_handlers << email_handler
-
-# Make our plugins visible to ohai
-
-Ohai::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"