Commit 1493377e authored by Vincent Bechu's avatar Vincent Bechu

[slapos] Add patch to handle wildcard in Zope

parent ffde96b3
From e98fd4d593699ee33c7ae29bd559488ef68e4fa2 Mon Sep 17 00:00:00 2001
From: Vincent Bechu <vincent.bechu@nexedi.com>
Date: Thu, 25 Oct 2018 14:55:49 +0200
Subject: [PATCH] [Products/SiteAccess] handle wildcard on rewrite url
---
src/Products/SiteAccess/VirtualHostMonster.py | 2 ++
src/Products/SiteAccess/tests/testVirtualHostMonster.py | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/Products/SiteAccess/VirtualHostMonster.py b/src/Products/SiteAccess/VirtualHostMonster.py
index 046d38c00..47a9e3c57 100644
--- a/src/Products/SiteAccess/VirtualHostMonster.py
+++ b/src/Products/SiteAccess/VirtualHostMonster.py
@@ -173,6 +173,8 @@ class VirtualHostMonster(Persistent, Item, Implicit):
stack[ii] = self.id
stack.insert(ii, '/')
ii += 1
+ if '*' in stack:
+ stack[stack.index('*')] = host.split('.')[0]
path = stack[:ii]
# If the directive is on top of the stack, go ahead
# and process it right away.
--
2.11.0
......@@ -4,10 +4,6 @@ extends =
parts +=
officejs-appstore
[eggs]
extra-paths +=
${officejs-appstore:location}
[erp5_repository_list]
repository_id_list += officejs-appstore
......@@ -19,13 +15,22 @@ list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${officejs-a
repository = https://lab.nexedi.com/nexedi/officejs-appstore.git
branch = master
[eggs]
extra-paths +=
${officejs-appstore:location}
Zope2-patches = ${officejs-appstore:location}/slapos/0001-Products-SiteAccess-handle-wildcard-on-rewrite-url.patch
#b5d97e2ff9a94aefd64158f9e4817096
Zope2-patch-options = -p1
[versions]
oauth2client = 4.0.0
pyasn1-modules = 0.0.8
rsa = 3.4.2
seaborn = 0.7.1
statsmodels = 0.8.0
# patched eggs
Zope2 = 2.13.28+SlapOSPatched001
# Required by:
# statsmodels==0.8.0
patsy = 0.4.1
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment