From 88e70aca521b557d3e45539272f41e0a635c98e2 Mon Sep 17 00:00:00 2001
From: chen-xing <chen.xing@99cloud.net>
Date: Fri, 25 Mar 2016 19:27:36 +0800
Subject: [PATCH] [config-reference]Update the configuration of dashboard

When installing the OpenStack Liberty in CentOS 7.1,the OS
uses httpd 2.4.x, and the configuration of dashboard is still
pointting to httpd 2.2. This patch is to fix it.

Change-Id: Ie958d15e00e6ede3c93c949018d9c7425e81be6b
Partial-Bug: #1548203
---
 .../source/dashboard/configure.rst            | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/doc/config-reference/source/dashboard/configure.rst b/doc/config-reference/source/dashboard/configure.rst
index b50aba2b94..baafde36c4 100644
--- a/doc/config-reference/source/dashboard/configure.rst
+++ b/doc/config-reference/source/dashboard/configure.rst
@@ -239,11 +239,26 @@ Use a domain that fits your current setup.
       Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static/
       <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
       # For Apache http server 2.2 and earlier:
-      Order allow,deny
-      Allow from all
-
+          <ifVersion <2.4>
+              Order allow,deny
+              Allow from all
+          </ifVersion>
       # For Apache http server 2.4 and later:
-      # Require all granted
+          <ifVersion >=2.4>
+      #The following two lines have been added by bms for error "AH01630: client denied
+      #by server configuration:
+      #/usr/share/openstack-dashboard/openstack_dashboard/static/dashboard/cssa"
+              Options All
+              AllowOverride All
+              Require all granted
+          </ifVersion>
+      </Directory>
+      <Directory /usr/share/openstack-dashboard/static>
+          <ifVersion >=2.4>
+              Options All
+              AllowOverride All
+              Require all granted
+          </ifVersion>
       </Directory>
       </VirtualHost>