From 449b79e0df3f1e1734b6662c8827040bfb5e618c Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Wed, 25 May 2016 11:18:26 -0400
Subject: [PATCH] Add Apache 2.4 syntax to status.o.o vhost

Change-Id: I1776a479a30efeb398a130f74c839ab8936cf370
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 modules/openstack_project/manifests/status.pp  |  8 ++++++++
 .../templates/status.vhost.erb                 | 18 ++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/modules/openstack_project/manifests/status.pp b/modules/openstack_project/manifests/status.pp
index babeac4764..8e00509edf 100644
--- a/modules/openstack_project/manifests/status.pp
+++ b/modules/openstack_project/manifests/status.pp
@@ -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,
diff --git a/modules/openstack_project/templates/status.vhost.erb b/modules/openstack_project/templates/status.vhost.erb
index a9537398dd..06c51c0822 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 %>
       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>