Merge remote-tracking branch 'github/pull/579'

[chef.git] / cookbooks / chef / templates / default / server.rb.erb

diff --git a/cookbooks/chef/templates/default/server.rb.erb b/cookbooks/chef/templates/default/server.rb.erb
index aa36dbd1bb073373cc7c69ca3407a4e734ed3b31..e7b9e0e9e01766b537b470fb48cc8f628a2fb195 100644 (file)
--- a/cookbooks/chef/templates/default/server.rb.erb
+++ b/cookbooks/chef/templates/default/server.rb.erb
@@ -13,9 +13,8 @@ lb['web_ui_fqdn'] = "chef.openstreetmap.org"
 
 nginx['non_ssl_port'] = false
 nginx['ssl_port'] = 4443
-nginx['ssl_certificate'] = '/etc/ssl/certs/openstreetmap.pem'
-nginx['ssl_certificate_key'] = '/etc/ssl/private/openstreetmap.key'
+nginx['ssl_certificate'] = '/etc/ssl/certs/chef.openstreetmap.org.pem'
+nginx['ssl_certificate_key'] = '/etc/ssl/private/chef.openstreetmap.org.key'
 nginx['server_name'] = "chef.openstreetmap.org"
-nginx['url'] = "http://chef.openstreetmap.org:4000"
 
 opscode_erchef['base_resource_url'] = "https://chef.openstreetmap.org"