Get rid of pre 14.04 compatibility that is no longer needed

[chef.git] / cookbooks / apache / templates / default / ssl.erb

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index 8035d4289e08719ac51eefacf5eb257bcd7a7b8d..63f0e21b0de1b3a69a60b3de1fc6fbf7a2841a55 100644 (file)
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -1,8 +1,15 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+SSLProtocol All -SSLv2 -SSLv3
+
 SSLHonorCipherOrder On
-SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
+SSLCipherSuite <%= node[:ssl][:ciphers] -%>
+
+SSLCertificateFile /etc/ssl/certs/<%= @certificate %>.pem
+SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
+SSLCertificateChainFile /etc/ssl/certs/<%= @certificate_chain %>.pem
 
-SSLCertificateFile /etc/ssl/certs/<%= @certiifcate %>.pem
-SSLCertificateKeyFile /etc/ssl/private/<%= @certiifcate %>.key
-SSLCertificateChainFile /etc/ssl/certs/rapidssl.pem
+SSLUseStapling On
+SSLStaplingResponderTimeout 5
+SSLStaplingReturnResponderErrors off
+SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)