X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/3ce3f0c3311b306f9808355397ee43424f14aa31..8db700c791944766bae9556109d0076cc9f6ea8b:/cookbooks/apache/templates/default/ssl.erb

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index 62486999d..6835e8ea5 100644
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -3,19 +3,21 @@
 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
+SSLCertificateChainFile /etc/ssl/certs/letsencrypt.pem
+<% end -%>
 
-<% if node[:lsb][:release].to_f >= 14.04 -%>
 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 max-age=86400 env=HTTPS
-<% else -%>
-Header set Strict-Transport-Security max-age=86400 env=HTTPS
+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