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 03b77f54b658c9792bd7379b2e88e3a51a5d8a7f..17ee112b6c9b5ee6915660aa0061794f71fc0809 100644 (file)
--- a/cookbooks/apache/templates/default/ssl.erb
+++ b/cookbooks/apache/templates/default/ssl.erb
@@ -3,11 +3,9 @@
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On
 SSLProtocol All -SSLv2 -SSLv3
 
 SSLHonorCipherOrder On

-SSLCipherSuite <%= node[:ssl][:ciphers] -%>
-
-SSLCertificateFile /etc/ssl/certs/<%= @certificate %>.pem
-SSLCertificateKeyFile /etc/ssl/private/<%= @certificate %>.key
+SSLCipherSuite <%= node[:ssl][:ciphers] %>

 <% if node[:lsb][:release].to_f < 16.04 -%>
 <% if node[:lsb][:release].to_f < 16.04 -%>

+

 SSLCertificateChainFile /etc/ssl/certs/letsencrypt.pem
 <% end -%>
 
 SSLCertificateChainFile /etc/ssl/certs/letsencrypt.pem
 <% end -%>