Switch chef back to using https for the internal forward

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index fed8d3a2d42fe18134e8375046065c317a85b3cf..88c1cb6a3be22eff5409741ee0a66738e5a5455e 100644 (file)
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -26,5 +26,5 @@
 
        SSLProxyEngine on
 
-       ProxyPass / http://127.0.0.1:4000/
+       ProxyPass / https://<%= node[:fqdn] %>:4443/
 </VirtualHost>

diff --git a/cookbooks/chef/templates/default/server.rb.erb b/cookbooks/chef/templates/default/server.rb.erb
index 08162858296414b4f24d38d238239270e2ba7a12..5abb4ccd781c3d688e5c6cbaef9e75eb486b0f7c 100644 (file)
--- a/cookbooks/chef/templates/default/server.rb.erb
+++ b/cookbooks/chef/templates/default/server.rb.erb
@@ -3,6 +3,8 @@
 nginx['enable_non_ssl'] = true
 nginx['non_ssl_port'] = 4000
 nginx['ssl_port'] = 4443
+nginx['ssl_certificate'] = '/etc/ssl/certs/openstreetmap.pem'
+nginx['ssl_certificate_key'] = '/etc/ssl/private/openstreetmap.key'
 nginx['server_name'] = "chef.openstreetmap.org"
 nginx['url'] = "http://chef.openstreetmap.org:4000"
 bookshelf['url'] = "https://chef.openstreetmap.org:443"