opendev/system-config
Code Issues Proposed changes

allow redirects in .htaccess files on the static web servers

Browse Source 
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>
This commit is contained in:
Doug Hellmann 2017-07-27 15:56:01 -04:00
parent 7e4893f77e
commit 1c9408780e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/openstack_project/templates/docs.vhost.erb
View File

@ -46,8 +46,9 @@
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
Satisfy any Satisfy any
Require all granted Require all granted
AllowOverride None
# Allow mod_rewrite rules # Allow mod_rewrite rules
AllowOverride FileInfo AllowOverrideList Redirect RedirectMatch
ErrorDocument 404 /errorpage.html ErrorDocument 404 /errorpage.html
</Directory> </Directory>

2
modules/openstack_project/templates/static-http-and-https.vhost.erb
View File

@ -17,6 +17,7 @@
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
AllowOverrideList Redirect RedirectMatch
Satisfy Any Satisfy Any
Require all granted Require all granted
</Directory> </Directory>
@ -45,6 +46,7 @@
<Directory <%= @docroot %>> <Directory <%= @docroot %>>
Options Indexes FollowSymLinks MultiViews Options Indexes FollowSymLinks MultiViews
AllowOverride None AllowOverride None
AllowOverrideList Redirect RedirectMatch
Satisfy Any Satisfy Any
Require all granted Require all granted
</Directory> </Directory>