Update piwik to 2.16.1

[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 9e91555c0106e6c4c51aa625ea35a75d8719892d..caf0b3a554a525c5404f127b9213e7925a8c549f 100644 (file)
--- 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
 
 # DO NOT EDIT - This file is being maintained by Chef
 

+SSLProtocol All -SSLv2 -SSLv3
+

 SSLHonorCipherOrder On
 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
+<% if node[:lsb][:release].to_f >= 14.04 -%>

 
 

-SSLCertificateFile /etc/ssl/certs/openstreetmap.pem
-SSLCertificateKeyFile /etc/ssl/private/openstreetmap.key
-SSLCertificateChainFile /etc/ssl/certs/rapidssl.pem
+SSLUseStapling On
+SSLStaplingResponderTimeout 5
+SSLStaplingReturnResponderErrors off
+SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)
+<% end -%>