X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/92837c0f85ab30e0793bfb1010cfc126ce6d3dde..4410e8b71cae55972a61b251bd39979b9ff77d74:/cookbooks/apache/templates/default/ssl.erb

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index 63f0e21b0..ffbbcbb5e 100644
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -3,13 +3,18 @@
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On
-SSLCipherSuite <%= node[:ssl][:ciphers] -%>
+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/<%= @certificate_chain %>.pem
+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)
+
+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'