summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2016-05-25 11:18:26 -0400
committerPaul Belanger <pabelanger@redhat.com>2016-05-25 13:07:59 -0400
commit449b79e0df3f1e1734b6662c8827040bfb5e618c (patch)
treed6169a1c10f0adfa7c33739f90edd55aaf2806ae
parent6f808e666fdeba9589a80f991ad0c8ef65d85345 (diff)
Add Apache 2.4 syntax to status.o.o vhost
Change-Id: I1776a479a30efeb398a130f74c839ab8936cf370 Signed-off-by: Paul Belanger <pabelanger@redhat.com>
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 25 May 2016 20:09:26 +0000 Reviewed-on: https://review.openstack.org/321068 Project: openstack-infra/system-config Branch: refs/heads/master
-rw-r--r--modules/openstack_project/manifests/status.pp8
-rw-r--r--modules/openstack_project/templates/status.vhost.erb18
2 files changed, 26 insertions, 0 deletions
diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index babeac4..8e00509 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -26,6 +26,14 @@ class openstack_project::status (
26 26
27 include ::httpd 27 include ::httpd
28 28
29 # The Apache mod_version module only needs to be enabled on Ubuntu 12.04
30 # as it comes compiled and enabled by default on newer OS, including CentOS
31 if !defined(Httpd::Mod['version']) and $::operatingsystem == 'Ubuntu' and $::operatingsystemrelease == '12.04' {
32 httpd::mod { 'version':
33 ensure => present
34 }
35 }
36
29 if ! defined(Httpd::Mod['rewrite']) { 37 if ! defined(Httpd::Mod['rewrite']) {
30 httpd::mod { 'rewrite': 38 httpd::mod { 'rewrite':
31 ensure => present, 39 ensure => present,
diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index a953739..06c51c0 100644
--- a/modules/openstack_project/templates/status.vhost.erb
+++ b/modules/openstack_project/templates/status.vhost.erb
@@ -17,6 +17,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
17 AllowOverride None 17 AllowOverride None
18 Order allow,deny 18 Order allow,deny
19 allow from all 19 allow from all
20 <IfVersion >= 2.4>
21 Require all granted
22 </IfVersion>
20 </Directory> 23 </Directory>
21 24
22 Alias /reviews /srv/static/reviewday 25 Alias /reviews /srv/static/reviewday
@@ -24,6 +27,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
24 AllowOverride None 27 AllowOverride None
25 Order allow,deny 28 Order allow,deny
26 allow from all 29 allow from all
30 <IfVersion >= 2.4>
31 Require all granted
32 </IfVersion>
27 </Directory> 33 </Directory>
28 34
29 Alias /openstack-health /srv/static/openstack-health 35 Alias /openstack-health /srv/static/openstack-health
@@ -31,6 +37,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
31 AllowOverride None 37 AllowOverride None
32 Order allow,deny 38 Order allow,deny
33 allow from all 39 allow from all
40 <IfVersion >= 2.4>
41 Require all granted
42 </IfVersion>
34 </Directory> 43 </Directory>
35 44
36 <Directory <%= @docroot %>> 45 <Directory <%= @docroot %>>
@@ -38,6 +47,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
38 AllowOverride None 47 AllowOverride None
39 Order allow,deny 48 Order allow,deny
40 allow from all 49 allow from all
50 <IfVersion >= 2.4>
51 Require all granted
52 </IfVersion>
41 </Directory> 53 </Directory>
42 54
43 # Sample elastic-recheck config file, adjust prefixes 55 # Sample elastic-recheck config file, adjust prefixes
@@ -48,6 +60,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
48 AllowOverride None 60 AllowOverride None
49 Order allow,deny 61 Order allow,deny
50 allow from all 62 allow from all
63 <IfVersion >= 2.4>
64 Require all granted
65 </IfVersion>
51 </Directory> 66 </Directory>
52 67
53 RedirectMatch permanent ^/rechecks(.*) /elastic-recheck 68 RedirectMatch permanent ^/rechecks(.*) /elastic-recheck
@@ -56,6 +71,9 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
56 AllowOverride None 71 AllowOverride None
57 Order allow,deny 72 Order allow,deny
58 allow from all 73 allow from all
74 <IfVersion >= 2.4>
75 Require all granted
76 </IfVersion>
59 </Directory> 77 </Directory>
60 78
61 79