Move git and dns from shenron to sarel

[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 dff9d19ed8dbbb9ce1ef3eb9f3f5143b9b698620..5c9d888f581c7548a22e7a1f6e82d376a318df13 100644 (file)
--- a/cookbooks/chef/templates/default/client.rb.erb
+++ b/cookbooks/chef/templates/default/client.rb.erb
@@ -23,11 +23,11 @@ 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::Config[:plugin_path] << "<%= node[:ohai][:plugin_dir] %>"
+ohai.plugin_path << "<%= node[:ohai][:plugin_dir] %>"
 
 # Load supporting code for report handlers
 
@@ -35,9 +35,9 @@ 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
+#exception_handlers << email_handler
+#report_handlers << email_handler