From d94b5a25a2a5fc58bb44a68564c7bd13fba41098 Mon Sep 17 00:00:00 2001
From: Ramy Asselin <ramy.asselin@hp.com>
Date: Mon, 16 Mar 2015 15:21:34 -0700
Subject: [PATCH] Log server can run on Apache 2.4 / Ubuntu Trusty

Apache 2.4 is the default version for Ubuntu Trusty.
Upgrade the apache configuration with the additional permissions
required to run on both Apache 2.2 and Apache 2.4.

Follows work done in I70d814a5eaefea5a3fb6a47bc215f4ab64be884f

Change-Id: Ie63cf936709b0f272b7129a2dc613d07a4d2fab2
---
 modules/openstack_project/templates/logs-dev.vhost.erb | 5 +++++
 modules/openstack_project/templates/logs.vhost.erb     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/modules/openstack_project/templates/logs-dev.vhost.erb b/modules/openstack_project/templates/logs-dev.vhost.erb
index 9191baa644..48d6e1b136 100644
--- a/modules/openstack_project/templates/logs-dev.vhost.erb
+++ b/modules/openstack_project/templates/logs-dev.vhost.erb
@@ -28,6 +28,11 @@ NameVirtualHost <%= @vhost_name %>:<%= @port %>
     AllowOverride None
     Order allow,deny
     allow from all
+    Satisfy Any
+  </Directory>
+  <Directory /usr/local/lib/python2.7/dist-packages/os_loganalyze>
+    Allow from all
+    Satisfy Any
   </Directory>
 
   <Directory <%= @docroot %>/*/*/*/*/*-tempest-dsvm*/*>
diff --git a/modules/openstack_project/templates/logs.vhost.erb b/modules/openstack_project/templates/logs.vhost.erb
index 64c4b98ea4..1bec5be358 100644
--- a/modules/openstack_project/templates/logs.vhost.erb
+++ b/modules/openstack_project/templates/logs.vhost.erb
@@ -28,6 +28,11 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
     AllowOverride None
     Order allow,deny
     allow from all
+    Satisfy Any
+  </Directory>
+  <Directory /usr/local/lib/python2.7/dist-packages/os_loganalyze>
+    Allow from all
+    Satisfy Any
   </Directory>
 
   <Directory <%= docroot %>/*/*/*/*/*-tempest-dsvm*/*>