diff --git a/modules/openstack_project/templates/cacti.vhost.erb b/modules/openstack_project/templates/cacti.vhost.erb index cc0664e71c..d2d8e5f791 100644 --- a/modules/openstack_project/templates/cacti.vhost.erb +++ b/modules/openstack_project/templates/cacti.vhost.erb @@ -14,11 +14,7 @@ Options +FollowSymLinks AllowOverride None - order allow,deny - allow from all - = 2.4> - Require all granted - + 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 f2effdba9a..087f199cbd 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 AllowOverride None - Order allow,deny - allow from all - = 2.4> - Require all granted - + Require all granted Alias /openstack-health /srv/static/openstack-health AllowOverride None - Order allow,deny - allow from all - = 2.4> - Require all granted - + Require all granted > Options <%= @options %> AllowOverride None - Order allow,deny - allow from all - = 2.4> - Require all granted - + Require all granted # Sample elastic-recheck config file, adjust prefixes @@ -48,22 +36,14 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %> Alias /elastic-recheck/data /var/lib/elastic-recheck AllowOverride None - Order allow,deny - allow from all - = 2.4> - Require all granted - + Require all granted RedirectMatch permanent ^/rechecks(.*) /elastic-recheck Alias /elastic-recheck /usr/local/share/elastic-recheck AllowOverride None - Order allow,deny - allow from all - = 2.4> - Require all granted - + Require all granted 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 83885588c6..7fbc44cc35 100644 --- a/modules/openstack_project/templates/survey.vhost.erb +++ b/modules/openstack_project/templates/survey.vhost.erb @@ -19,8 +19,6 @@ > Options <%= @options %> AllowOverride None - Order allow,deny - allow from all Require all granted