opendev/system-config
Code Issues Proposed changes

More old apache acl cleanups

Browse Source 
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
This commit is contained in:
Clark Boylan 2020-10-16 11:15:32 -07:00
parent ef94bf7645
commit fa362b813c
3 changed files with 6 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openstack_project/templates/cacti.vhost.erb
View File

@ -14,11 +14,7 @@
<Directory /usr/share/cacti/site> <Directory /usr/share/cacti/site>
Options +FollowSymLinks Options +FollowSymLinks
AllowOverride None AllowOverride None
order allow,deny
allow from all
<IfVersion >= 2.4>
Require all granted Require all granted
</IfVersion>
AddType application/x-httpd-php .php AddType application/x-httpd-php .php

20
modules/openstack_project/templates/status.vhost.erb
View File

@ -15,31 +15,19 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
Alias /reviews /srv/static/reviewday Alias /reviews /srv/static/reviewday
<Directory /srv/static/reviewday> <Directory /srv/static/reviewday>
AllowOverride None AllowOverride None
Order allow,deny
allow from all
<IfVersion >= 2.4>
Require all granted Require all granted
</IfVersion>
</Directory> </Directory>
Alias /openstack-health /srv/static/openstack-health Alias /openstack-health /srv/static/openstack-health
<Directory /srv/static/openstack-health> <Directory /srv/static/openstack-health>
AllowOverride None AllowOverride None
Order allow,deny
allow from all
<IfVersion >= 2.4>
Require all granted Require all granted
</IfVersion>
</Directory> </Directory>
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options <%= @options %> Options <%= @options %>
AllowOverride None AllowOverride None
Order allow,deny
allow from all
<IfVersion >= 2.4>
Require all granted Require all granted
</IfVersion>
</Directory> </Directory>
# Sample elastic-recheck config file, adjust prefixes # Sample elastic-recheck config file, adjust prefixes
@ -48,22 +36,14 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
Alias /elastic-recheck/data /var/lib/elastic-recheck Alias /elastic-recheck/data /var/lib/elastic-recheck
<Directory /var/lib/elastic-recheck> <Directory /var/lib/elastic-recheck>
AllowOverride None AllowOverride None
Order allow,deny
allow from all
<IfVersion >= 2.4>
Require all granted Require all granted
</IfVersion>
</Directory> </Directory>
RedirectMatch permanent ^/rechecks(.*) /elastic-recheck RedirectMatch permanent ^/rechecks(.*) /elastic-recheck
Alias /elastic-recheck /usr/local/share/elastic-recheck Alias /elastic-recheck /usr/local/share/elastic-recheck
<Directory /usr/local/share/elastic-recheck> <Directory /usr/local/share/elastic-recheck>
AllowOverride None AllowOverride None
Order allow,deny
allow from all
<IfVersion >= 2.4>
Require all granted Require all granted
</IfVersion>
</Directory> </Directory>
RedirectMatch temp ^/zuul(.*) https://zuul.opendev.org/t/openstack/status RedirectMatch temp ^/zuul(.*) https://zuul.opendev.org/t/openstack/status

2
modules/openstack_project/templates/survey.vhost.erb
View File

@ -19,8 +19,6 @@
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options <%= @options %> Options <%= @options %>
AllowOverride None AllowOverride None
Order allow,deny
allow from all
Require all granted Require all granted
</Directory> </Directory>