From: Tom Hughes <tom@compton.nu>
Date: Fri, 16 Feb 2018 12:40:12 +0000 (+0000)
Subject: Fix alias processing in mediawiki apache configuration
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/6b4bb3c28e7e2af088e5a7b9695d64733efebf6c?ds=sidebyside

Fix alias processing in mediawiki apache configuration
---

diff --git a/cookbooks/mediawiki/templates/default/apache.erb b/cookbooks/mediawiki/templates/default/apache.erb
index a4e0e48a4..913fc9acc 100644
--- a/cookbooks/mediawiki/templates/default/apache.erb
+++ b/cookbooks/mediawiki/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 %>-secure-access.log combined
   ErrorLog /var/log/apache2/<%= @name %>-secure-error.log
-<% end -%>
 
   DocumentRoot <%= @directory %>