Remove legacy certificate support

[chef.git] / cookbooks / apache / templates / default / ssl.erb

diff --git a/cookbooks/apache/templates/default/ssl.erb b/cookbooks/apache/templates/default/ssl.erb
index e117eeaeda648c8b0f3fa273684bf9e655b2dae3..17ee112b6c9b5ee6915660aa0061794f71fc0809 100644 (file)
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -3,10 +3,11 @@
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On
 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/letsencrypt.pem
+<% end -%>

 
 SSLUseStapling On
 SSLStaplingResponderTimeout 5
 
 SSLUseStapling On
 SSLStaplingResponderTimeout 5