Fix certificate paths for chef server

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index 1fb417fcb50374ee682090e19e2e6f814b30af78..88684b82c4ca7d2221be4d32d3b1973efff1c768 100644 (file)
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -25,4 +25,5 @@
        SSLCertificateKeyFile /etc/ssl/private/chef.openstreetmap.org.key
 
        ProxyPass / https://<%= node[:fqdn] %>:4443/
        SSLCertificateKeyFile /etc/ssl/private/chef.openstreetmap.org.key
 
        ProxyPass / https://<%= node[:fqdn] %>:4443/

+       ProxyPreserveHost on

 </VirtualHost>
 </VirtualHost>

diff --git a/cookbooks/chef/templates/default/server.rb.erb b/cookbooks/chef/templates/default/server.rb.erb
index e3687f80b4af70506fcc818285211c09f85d78eb..e7b9e0e9e01766b537b470fb48cc8f628a2fb195 100644 (file)
--- a/cookbooks/chef/templates/default/server.rb.erb
+++ b/cookbooks/chef/templates/default/server.rb.erb
@@ -13,8 +13,8 @@ lb['web_ui_fqdn'] = "chef.openstreetmap.org"
 
 nginx['non_ssl_port'] = false
 nginx['ssl_port'] = 4443
 
 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"
 
 opscode_erchef['base_resource_url'] = "https://chef.openstreetmap.org"
 nginx['server_name'] = "chef.openstreetmap.org"
 
 opscode_erchef['base_resource_url'] = "https://chef.openstreetmap.org"