summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Coldrick <adam@sotk.co.uk>2018-08-01 23:19:36 +0100
committerAdam Coldrick <adam@sotk.co.uk>2018-08-01 23:24:00 +0100
commitc4c7e17f1933194784f7bbf3f07cc746e4b58d1d (patch)
treeeefde90cd5023f1c86a697e8a3ce1ea4fb6ac629
parent241a60c5fab771794765369da72a4613feddb064 (diff)
Set "AllowEncodedSlashes on" in vhost templates
This is required to properly support handling requests for project by name, where the name may contain encoded slashes. For example, GET /v1/projects/openstack-infra%2Fstoryboard causes Apache to give a 404 error without this patch. Change-Id: Ibe95dbfc28621574bac7e4af78fe1d913fa4e1b6
Notes
Notes (review): Code-Review+2: Clark Boylan <cboylan@sapwetik.org> Workflow+1: Clark Boylan <cboylan@sapwetik.org> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Code-Review+2: Monty Taylor <mordred@inaugust.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Wed, 01 Aug 2018 23:10:37 +0000 Reviewed-on: https://review.openstack.org/588095 Project: openstack-infra/puppet-storyboard Branch: refs/heads/master
-rw-r--r--templates/storyboard_http.vhost.erb2
-rw-r--r--templates/storyboard_https.vhost.erb2
2 files changed, 4 insertions, 0 deletions
diff --git a/templates/storyboard_http.vhost.erb b/templates/storyboard_http.vhost.erb
index 7020bc8..524adad 100644
--- a/templates/storyboard_http.vhost.erb
+++ b/templates/storyboard_http.vhost.erb
@@ -4,6 +4,8 @@
4<% end %> 4<% end %>
5 ServerName <%= scope.lookupvar("storyboard::application::hostname") %> 5 ServerName <%= scope.lookupvar("storyboard::application::hostname") %>
6 6
7 AllowEncodedSlashes on
8
7 DocumentRoot <%= scope.lookupvar("storyboard::application::www_root") %> 9 DocumentRoot <%= scope.lookupvar("storyboard::application::www_root") %>
8 10
9 WSGIDaemonProcess storyboard user=<%= scope.lookupvar("storyboard::params::user") %> group=<%= scope.lookupvar("storyboard::params::group") %> threads=5 python-path=/usr/local/lib/python2.7/dist-packages 11 WSGIDaemonProcess storyboard user=<%= scope.lookupvar("storyboard::params::user") %> group=<%= scope.lookupvar("storyboard::params::group") %> threads=5 python-path=/usr/local/lib/python2.7/dist-packages
diff --git a/templates/storyboard_https.vhost.erb b/templates/storyboard_https.vhost.erb
index 9e24526..15ce048 100644
--- a/templates/storyboard_https.vhost.erb
+++ b/templates/storyboard_https.vhost.erb
@@ -48,6 +48,8 @@
48 # MSIE 7 and newer should be able to use keepalive 48 # MSIE 7 and newer should be able to use keepalive
49 BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown 49 BrowserMatch "MSIE [17-9]" ssl-unclean-shutdown
50 50
51 AllowEncodedSlashes on
52
51 DocumentRoot <%= scope.lookupvar("storyboard::application::www_root") %> 53 DocumentRoot <%= scope.lookupvar("storyboard::application::www_root") %>
52 54
53 WSGIDaemonProcess storyboard user=<%= scope.lookupvar("storyboard::params::user") %> group=<%= scope.lookupvar("storyboard::params::group") %> threads=5 python-path=/usr/local/lib/python2.7/dist-packages 55 WSGIDaemonProcess storyboard user=<%= scope.lookupvar("storyboard::params::user") %> group=<%= scope.lookupvar("storyboard::params::group") %> threads=5 python-path=/usr/local/lib/python2.7/dist-packages