Add apache mime type mapping for xz files

[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 1124f66d8550539316227603eb978910a9423780..caf0b3a554a525c5404f127b9213e7925a8c549f 100644 (file)
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -3,11 +3,11 @@
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On
 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
 
 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
 <% if node[:lsb][:release].to_f >= 14.04 -%>
 
 SSLUseStapling On