Browse Source

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
changes/11/758611/1
Clark Boylan 9 months ago
parent
commit
fa362b813c
  1. 6
      modules/openstack_project/templates/cacti.vhost.erb
  2. 30
      modules/openstack_project/templates/status.vhost.erb
  3. 2
      modules/openstack_project/templates/survey.vhost.erb

6
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

30
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

2
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>

Loading…
Cancel
Save