From b7ec30a9ded83a4cc65f17eae78596076baebf5c Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Thu, 16 May 2019 15:08:35 +1000
Subject: [PATCH] Move to apache 2.4 access always

Because this only matches trusty, it installs the old access list on
xenial and beyond.  Just use the 2.4 format.

Change-Id: I62a54e1c886efea9f1377967e8e4716068c53b4a
---
 templates/askbot.vhost.erb | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/templates/askbot.vhost.erb b/templates/askbot.vhost.erb
index f0fa4e5..1ab7bf4 100644
--- a/templates/askbot.vhost.erb
+++ b/templates/askbot.vhost.erb
@@ -3,8 +3,6 @@
 # Managed by Puppet
 # ************************************
 
-<% trusty_compatible = @lsbdistcodename == 'trusty' %>
-
 WSGIRestrictStdout On
 WSGIRestrictSignal Off
 
@@ -31,17 +29,13 @@ NameVirtualHost <%= @vhost_name %>:443
   # media files
   Alias /m/ <%= @docroot %>/static/
   <Directory <%= @docroot %>/static/>
-    Order deny,allow
-    Allow from all
-    <%if trusty_compatible %>Require all granted<%end%>
+    Require all granted
   </Directory>
 
   # uploaded files
   Alias /upfiles/ <%= @docroot %>/upfiles/
   <Directory <%= @docroot %>/upfiles/>
-    Order deny,allow
-    Allow from all
-    <%if trusty_compatible %>Require all granted<%end%>
+    Require all granted
   </Directory>
 
   # wsgi daemon
@@ -51,9 +45,7 @@ NameVirtualHost <%= @vhost_name %>:443
 
   <Location />
    WSGIProcessGroup askbot
-   Order deny,allow
-   Allow from all
-    <%if trusty_compatible %>Require all granted<%end%>
+   Require all granted
   </Location>
 
   ErrorLog /var/log/apache2/<%= @name %>_error.log