X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..098634e073c80dfde4038715bc683985b18c5184:/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 e4bba9250..dff9d19ed 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
@@ -21,14 +17,22 @@ log_level :info
 
 log_location "/var/log/chef/client.log"
 
-# Don't verify SSL certificates
+# Verify SSL certificates
 
-ssl_verify_mode :verify_none
+ssl_verify_mode :verify_peer
 
 # Set the URL for the chef server
 
 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] << "/etc/chef/ohai"