X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/24ec2141b1f15d3553b47fa3b2e299bd826be1fe..c3eaabdeabe865ec028693cbb4d77a0f7a88a90a:/cookbooks/apache/templates/default/ssl.erb

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index ac25cc4bc..caf0b3a55 100644
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -1,8 +1,17 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+SSLProtocol All -SSLv2 -SSLv3
+
 SSLHonorCipherOrder On
-SSLCipherSuite aRSA+HIGH:+kEDH:+kRSA:!kSRP:!kPSK:+3DES:!MD5
+SSLCipherSuite <%= node[:ssl][:ciphers] -%>
 
 SSLCertificateFile /etc/ssl/certs/<%= @certificate %>.pem
 SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
-SSLCertificateChainFile /etc/ssl/certs/rapidssl.pem
+SSLCertificateChainFile /etc/ssl/certs/<%= @certificate_chain %>.pem
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+
+SSLUseStapling On
+SSLStaplingResponderTimeout 5
+SSLStaplingReturnResponderErrors off
+SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)
+<% end -%>