commit fa362b813ca0ed8c70f1d7a2e4c3d270eb41ceaa
Author: Clark Boylan <clark.boylan@gmail.com>
Date:   Fri Oct 16 11:15:32 2020 -0700

    More old apache acl cleanups
    
    We can rely on Require instead of Order, Allow, Deny, Satisfy since we
    are all on apache 2.4 now. This simplifies reasoning about acl rules.
    
    Change-Id: Idedba1558ccaa1c753d1175e356bf26a8d4b1084

diff --git a/modules/openstack_project/templates/cacti.vhost.erb b/modules/openstack_project/templates/cacti.vhost.erb
index cc0664e..d2d8e5f 100644
--- a/modules/openstack_project/templates/cacti.vhost.erb
+++ b/modules/openstack_project/templates/cacti.vhost.erb
@@ -14,11 +14,7 @@
   <Directory /usr/share/cacti/site>
     Options +FollowSymLinks
     AllowOverride None
-    order allow,deny
-    allow from all
-    <IfVersion >= 2.4>
-       Require all granted
-    </IfVersion>
+    Require all granted
 
     AddType application/x-httpd-php .php
 
diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index f2effdb..087f199 100644
--- a/modules/openstack_project/templates/status.vhost.erb
+++ b/modules/openstack_project/templates/status.vhost.erb
@@ -15,31 +15,19 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
   Alias /reviews /srv/static/reviewday
   <Directory /srv/static/reviewday>
       AllowOverride None
-      Order allow,deny
-      allow from all
-      <IfVersion >= 2.4>
-        Require all granted
-      </IfVersion>
+      Require all granted
   </Directory>
 
   Alias /openstack-health /srv/static/openstack-health
   <Directory /srv/static/openstack-health>
     AllowOverride None
-    Order allow,deny
-    allow from all
-    <IfVersion >= 2.4>
-      Require all granted
-    </IfVersion>
+    Require all granted
   </Directory>
 
   <Directory <%= @docroot %>>
     Options <%= @options %>
     AllowOverride None
-    Order allow,deny
-    allow from all
-    <IfVersion >= 2.4>
-      Require all granted
-    </IfVersion>
+    Require all granted
   </Directory>
 
   # Sample elastic-recheck config file, adjust prefixes
@@ -48,22 +36,14 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
   Alias /elastic-recheck/data /var/lib/elastic-recheck
   <Directory /var/lib/elastic-recheck>
       AllowOverride None
-      Order allow,deny
-      allow from all
-      <IfVersion >= 2.4>
-        Require all granted
-      </IfVersion>
+      Require all granted
   </Directory>
 
   RedirectMatch permanent ^/rechecks(.*) /elastic-recheck
   Alias /elastic-recheck /usr/local/share/elastic-recheck
   <Directory /usr/local/share/elastic-recheck>
       AllowOverride None
-      Order allow,deny
-      allow from all
-      <IfVersion >= 2.4>
-        Require all granted
-      </IfVersion>
+      Require all granted
   </Directory>
 
   RedirectMatch temp ^/zuul(.*) https://zuul.opendev.org/t/openstack/status
diff --git a/modules/openstack_project/templates/survey.vhost.erb b/modules/openstack_project/templates/survey.vhost.erb
index 8388558..7fbc44c 100644
--- a/modules/openstack_project/templates/survey.vhost.erb
+++ b/modules/openstack_project/templates/survey.vhost.erb
@@ -19,8 +19,6 @@
   <Directory <%= @docroot %>>
     Options <%= @options %>
     AllowOverride None
-    Order allow,deny
-    allow from all
     Require all granted
   </Directory>