From: Tom Hughes <tom@compton.nu>
Date: Sun, 26 Oct 2014 15:00:00 +0000 (+0000)
Subject: Remove site specific SSL config
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5680fb8cfeab3486ae5bfe1283ffc6cf13ac57a2

Remove site specific SSL config
---

diff --git a/cookbooks/chef/templates/default/apache.erb b/cookbooks/chef/templates/default/apache.erb
index 88c1cb6a3..f6c1806b1 100644
--- a/cookbooks/chef/templates/default/apache.erb
+++ b/cookbooks/chef/templates/default/apache.erb
@@ -15,15 +15,10 @@
 	ServerName chef.openstreetmap.org
 	ServerAdmin webmaster@openstreetmap.org
 
-	SSLEngine on
-	SSLProtocol all -SSLv2
-	SSLCipherSuite ALL:!ADH:!EXPORT:!SSLv2:RC4+RSA:+HIGH:+MEDIUM:+LOW
-	SSLCertificateFile /etc/ssl/certs/openstreetmap.pem
-	SSLCertificateKeyFile /etc/ssl/private/openstreetmap.key
-
 	CustomLog /var/log/apache2/chef.openstreetmap.org-access.log combined
 	ErrorLog /var/log/apache2/chef.openstreetmap.org-error.log
 
+	SSLEngine on
 	SSLProxyEngine on
 
 	ProxyPass / https://<%= node[:fqdn] %>:4443/