X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1952990836d6687ed4030bb95ca5f9e535eaf61f..891d124699c14c4b91f8924d06dd2af8697e6e87:/cookbooks/wordpress/templates/default/apache.erb

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index b62705100..6281fc2db 100644
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -24,17 +24,9 @@
 
   ServerAdmin webmaster@openstreetmap.org
 
-  #
-  # Enable SSL
-  #
   SSLEngine on
-<% if @ssl_certificate -%>
-  SSLCertificateFile /etc/ssl/certs/<%= @ssl_certificate %>.pem
-  SSLCertificateKeyFile /etc/ssl/private/<%= @ssl_certificate %>.key
-<% end -%>
-<% if @ssl_certificate -%>
-  SSLCertificateChainFile /etc/ssl/certs/<%= @ssl_certificate_chain %>.pem
-<% end -%>
+  SSLCertificateFile /etc/ssl/certs/<%= @name %>.pem
+  SSLCertificateKeyFile /etc/ssl/private/<%= @name %>.key
 
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log