Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
officejs-appstore
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
officejs-appstore
Commits
a64109a6
Commit
a64109a6
authored
Dec 06, 2018
by
Vincent Bechu
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[slapos] Add patch to handle wildcard in Zope
parent
ffde96b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
36 additions
and
5 deletions
+36
-5
slapos/0001-Products-SiteAccess-handle-wildcard-on-rewrite-url.patch
...-Products-SiteAccess-handle-wildcard-on-rewrite-url.patch
+26
-0
slapos/software.cfg
slapos/software.cfg
+10
-5
No files found.
slapos/0001-Products-SiteAccess-handle-wildcard-on-rewrite-url.patch
0 → 100644
View file @
a64109a6
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
slapos/software.cfg
View file @
a64109a6
...
@@ -4,10 +4,6 @@ extends =
...
@@ -4,10 +4,6 @@ extends =
parts +=
parts +=
officejs-appstore
officejs-appstore
[eggs]
extra-paths +=
${officejs-appstore:location}
[erp5_repository_list]
[erp5_repository_list]
repository_id_list += officejs-appstore
repository_id_list += officejs-appstore
...
@@ -19,13 +15,22 @@ list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${officejs-a
...
@@ -19,13 +15,22 @@ list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${officejs-a
repository = https://lab.nexedi.com/nexedi/officejs-appstore.git
repository = https://lab.nexedi.com/nexedi/officejs-appstore.git
branch = master
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]
[versions]
oauth2client = 4.0.0
oauth2client = 4.0.0
pyasn1-modules = 0.0.8
pyasn1-modules = 0.0.8
rsa = 3.4.2
rsa = 3.4.2
seaborn = 0.7.1
seaborn = 0.7.1
statsmodels = 0.8.0
statsmodels = 0.8.0
# patched eggs
Zope2 = 2.13.28+SlapOSPatched001
# Required by:
# Required by:
# statsmodels==0.8.0
# statsmodels==0.8.0
patsy = 0.4.1
patsy = 0.4.1
\ No newline at end of file
Romain Courteaud
@romain
mentioned in merge request
!10 (closed)
·
Feb 01, 2019
mentioned in merge request
!10 (closed)
mentioned in merge request !10
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment