Send a report only Expect-CT header with https responses

[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 07f007c50d3951359f5129f9babbccee22a586a8..6835e8ea54745a2ef22c30b0c28e6e649536f415 100644 (file)
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -1,14 +1,23 @@
 # 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] %>
+<% if node[:lsb][:release].to_f < 16.04 -%>
 
-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 -%>
+SSLCertificateChainFile /etc/ssl/certs/letsencrypt.pem
+<% end -%>
 
 SSLUseStapling On
+SSLStaplingResponderTimeout 5
+SSLStaplingErrorCacheTimeout 60
 SSLStaplingReturnResponderErrors off
+SSLStaplingFakeTryLater off
 SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)
+<% if node[:ssl][:strict_transport_security] -%>
+
+Header setifempty Strict-Transport-Security "<%= node[:ssl][:strict_transport_security] %>" env=HTTPS
 <% end -%>
+
+Header setifempty Expect-CT "max-age=0, report-uri=\"https://openstreetmap.report-uri.com/r/d/ct/reportOnly\"" env=HTTPS