X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d3e78135b9554f8eb971bdd84417db365adc8b05..6a06eb8d968c4846c5afaecb720d4c2f21153f62:/cookbooks/apache/templates/default/ssl.erb?ds=sidebyside diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb index 7b16c1bbd..81afb3de5 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 @@ -16,4 +12,4 @@ SSLStaplingReturnResponderErrors off SSLStaplingFakeTryLater off SSLStaplingCache shmcb:${APACHE_RUN_DIR}/ssl_ocspcache(512000) -Header setifempty Strict-Transport-Security max-age=3600 env=HTTPS +Header always set Strict-Transport-Security "<%= node[:ssl][:strict_transport_security] %>" "expr=%{HTTPS} == 'on'"