From 0ff09336c78a7f9dbc446fcb66cb762980fb3ff5 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 22 Feb 2017 21:46:19 +0000 Subject: [PATCH 1/1] Fix certificate paths for chef server --- cookbooks/chef/templates/default/apache.erb | 1 + cookbooks/chef/templates/default/server.rb.erb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb index 1fb417fcb..88684b82c 100644 --- 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/ + ProxyPreserveHost on diff --git a/cookbooks/chef/templates/default/server.rb.erb b/cookbooks/chef/templates/default/server.rb.erb index e3687f80b..e7b9e0e9e 100644 --- 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['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" -- 2.43.2