X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/32641df676f37ede4ba619fd6b7fb0a37db1b6a4..559ad3ed3bbd2537dda4046684c2635bd95d7cfa:/cookbooks/apache/templates/default/ssl.erb

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index a703b04c7..80735c9cb 100644
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -3,11 +3,7 @@
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On
-SSLCipherSuite <%= node[:ssl][:ciphers] %>
-<% if node[:lsb][:release].to_f < 16.04 -%>
-
-SSLCertificateChainFile /etc/ssl/certs/letsencrypt.pem
-<% end -%>
+SSLCipherSuite <%= node[:ssl][:openssl_ciphers] %>
 
 SSLUseStapling On
 SSLStaplingResponderTimeout 5
@@ -15,3 +11,6 @@ SSLStaplingErrorCacheTimeout 60
 SSLStaplingReturnResponderErrors off
 SSLStaplingFakeTryLater off
 SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000)
+
+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'