opendev/system-config
Code Issues Proposed changes

Add Apache 2.4 syntax to status.o.o vhost

Browse Source 
Change-Id: I1776a479a30efeb398a130f74c839ab8936cf370
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2016-05-25 11:18:26 -04:00
parent 6f808e666f
commit 449b79e0df
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/openstack_project/manifests/status.pp
View File

@ -26,6 +26,14 @@ class openstack_project::status (
include ::httpd include ::httpd
# The Apache mod_version module only needs to be enabled on Ubuntu 12.04
# as it comes compiled and enabled by default on newer OS, including CentOS
if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
httpd::mod { 'version':
ensure => present
}
}
if ! defined(Httpd::Mod['rewrite']) { if ! defined(Httpd::Mod['rewrite']) {
httpd::mod { 'rewrite': httpd::mod { 'rewrite':
ensure => present, ensure => present,

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

@ -17,6 +17,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>
Alias /reviews /srv/static/reviewday Alias /reviews /srv/static/reviewday
@ -24,6 +27,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>
Alias /openstack-health /srv/static/openstack-health Alias /openstack-health /srv/static/openstack-health
@ -31,6 +37,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
@ -38,6 +47,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>
# Sample elastic-recheck config file, adjust prefixes # Sample elastic-recheck config file, adjust prefixes
@ -48,6 +60,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>
RedirectMatch permanent ^/rechecks(.*) /elastic-recheck RedirectMatch permanent ^/rechecks(.*) /elastic-recheck
@ -56,6 +71,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
AllowOverride None AllowOverride None
Order allow,deny Order allow,deny
allow from all allow from all
<IfVersion >= 2.4>
Require all granted
</IfVersion>
</Directory> </Directory>