From: Grant Slater <github@firefishy.com>
Date: Sat, 12 Aug 2023 19:52:23 +0000 (+0100)
Subject: wordpress: enable SSL when no aliases are specified
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/0afecc61be3839d1e6ac5c2048c0b1b6936d32bd

wordpress: enable SSL when no aliases are specified
---

diff --git a/cookbooks/wordpress/templates/default/apache.erb b/cookbooks/wordpress/templates/default/apache.erb
index 67476b6f8..c1a87bdad 100644
--- a/cookbooks/wordpress/templates/default/apache.erb
+++ b/cookbooks/wordpress/templates/default/apache.erb
@@ -19,6 +19,7 @@
   ServerName <%= @name %>
 <% @aliases.each do |alias_name| -%>
   ServerAlias <%= alias_name %>
+<% end -%>
 
   ServerAdmin webmaster@openstreetmap.org
 
@@ -28,7 +29,6 @@
 
   CustomLog /var/log/apache2/<%= @name %>-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-error.log
-<% end -%>
 
   DocumentRoot <%= @directory %>
 <% @urls.each do |url,directory| -%>