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

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index 9e91555c0..ffbbcbb5e 100644
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -1,8 +1,20 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+SSLProtocol All -SSLv2 -SSLv3
+
 SSLHonorCipherOrder On
-SSLCipherSuite ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM
+SSLCipherSuite <%= node[:ssl][:ciphers] %>
+<% if node[:lsb][:release].to_f < 16.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)
 
-SSLCertificateFile /etc/ssl/certs/openstreetmap.pem
-SSLCertificateKeyFile /etc/ssl/private/openstreetmap.key
-SSLCertificateChainFile /etc/ssl/certs/rapidssl.pem
+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'