From 1c9408780ec421ef7658713c5364b0e545de69fa Mon Sep 17 00:00:00 2001
From: Doug Hellmann <doug@doughellmann.com>
Date: Thu, 27 Jul 2017 15:56:01 -0400
Subject: [PATCH] allow redirects in .htaccess files on the static web servers

As part of allowing projects to establish redirects when they move
documentation pages around, we need to let them use .htaccess
files. We only want to allow Redirect and RedirectMatch directives,
though. This change restricts the directives on docs.o.o and adds them
on the static servers used for drafts published during a build (to
allow testing of the redirects).

See
http://lists.openstack.org/pipermail/openstack-dev/2017-July/120240.html
for more details.

Change-Id: I236b7b0a9aae065167bd0aef316603d258e4c3c6
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
---
 modules/openstack_project/templates/docs.vhost.erb             | 3 ++-
 .../templates/static-http-and-https.vhost.erb                  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/openstack_project/templates/docs.vhost.erb b/modules/openstack_project/templates/docs.vhost.erb
index d36b0b32d9..a7096f6ba9 100644
--- a/modules/openstack_project/templates/docs.vhost.erb
+++ b/modules/openstack_project/templates/docs.vhost.erb
@@ -46,8 +46,9 @@
         Options Indexes FollowSymLinks MultiViews
         Satisfy any
         Require all granted
+        AllowOverride None
         # Allow mod_rewrite rules
-        AllowOverride FileInfo
+        AllowOverrideList Redirect RedirectMatch
         ErrorDocument 404 /errorpage.html
     </Directory>
 
diff --git a/modules/openstack_project/templates/static-http-and-https.vhost.erb b/modules/openstack_project/templates/static-http-and-https.vhost.erb
index 189ee44afc..a82bd24b9f 100644
--- a/modules/openstack_project/templates/static-http-and-https.vhost.erb
+++ b/modules/openstack_project/templates/static-http-and-https.vhost.erb
@@ -17,6 +17,7 @@
   <Directory <%= @docroot %>>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
+    AllowOverrideList Redirect RedirectMatch
     Satisfy Any
     Require all granted
   </Directory>
@@ -45,6 +46,7 @@
   <Directory <%= @docroot %>>
     Options Indexes FollowSymLinks MultiViews
     AllowOverride None
+    AllowOverrideList Redirect RedirectMatch
     Satisfy Any
     Require all granted
   </Directory>