From: Tom Hughes <tom@compton.nu>
Date: Sun, 26 Oct 2014 14:57:27 +0000 (+0000)
Subject: Switch chef back to using https for the internal forward
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e76c27656e216accb551db4ac1d61de9183fcfa9

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 fed8d3a2d..88c1cb6a3 100644
--- 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 081628582..5abb4ccd7 100644
--- 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"