Update hardware cookbook for new version of Intel SSD tool

[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 f7cbb27122c2f412e21b2a5e748f26e958a00cf3..80735c9cb51d3d0a53e6b18a878301f635f87b52 100644 (file)
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -3,15 +3,14 @@
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On

-SSLCipherSuite <%= node[:ssl][:ciphers] -%>
-
-SSLCertificateFile /etc/ssl/certs/<%= @certificate %>.pem
-SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
-SSLCertificateChainFile /etc/ssl/certs/rapidssl.pem
-<% if node[:lsb][:release].to_f >= 14.04 -%>
+SSLCipherSuite <%= node[:ssl][:openssl_ciphers] %>

 
 SSLUseStapling On
 SSLStaplingResponderTimeout 5
 
 SSLUseStapling On
 SSLStaplingResponderTimeout 5

+SSLStaplingErrorCacheTimeout 60

 SSLStaplingReturnResponderErrors off
 SSLStaplingReturnResponderErrors off

+SSLStaplingFakeTryLater off

 SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)
 SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)

-<% end -%>
+
+Header always set Strict-Transport-Security "<%= node[:ssl][:strict_transport_security] %>" "expr=%{HTTPS} == 'on'"
+Header always set Expect-CT "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"" "expr=%{HTTPS} == 'on'