Merge "Add Apache 2.4 syntax to status.o.o vhost"

This commit is contained in:
Jenkins 2016-05-25 20:09:26 +00:00 committed by Gerrit Code Review
commit 586a99f718
2 changed files with 26 additions and 0 deletions

View File

@ -26,6 +26,14 @@ class openstack_project::status (
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']) {
httpd::mod { 'rewrite':
ensure => present,

View File

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