tilecache: nginx strip query parameters

[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 e4bba9250e94464f5b536a62df40d824f5d7c2fa..65bf700e8dbe4a56880e037c55fe40074016bca5 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
@@ -21,23 +17,27 @@ 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"
+chef_server_url "https://chef.openstreetmap.org/organizations/openstreetmap"
+
+# Make our plugins visible to ohai
+
+ohai.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")
+email_handler = Chef::Handler::Email.new(:to => ["tom@compton.nu", "openstreetmap@firefishy.com"])
 
 # Configure report handlers
 
 exception_handlers << email_handler
 report_handlers << email_handler
-
-# Make our plugins visible to ohai
-
-Ohai::Config[:plugin_path] << "/etc/chef/ohai"