Commit 81a0045d authored by Roque's avatar Roque

Update software configuration

See merge request !26
parents 47446f95 872300da
Pipeline #31898 passed with stage
in 0 seconds
...@@ -74,7 +74,9 @@ class TestSlapOSConfigurator(testOfficeJSAppstoreMixin): ...@@ -74,7 +74,9 @@ class TestSlapOSConfigurator(testOfficeJSAppstoreMixin):
# set preference # set preference
preference_tool = self.portal.portal_preferences preference_tool = self.portal.portal_preferences
conversion_url = "https://cloudooo.erp5.net/" conversion_url = "https://cloudooo.erp5.net/"
self.assertEqual(preference_tool.getPreferredDocumentConversionServerUrl(), conversion_url) conversion_url1 = "https://cloudooo1.erp5.net/"
server_url = preference_tool.getPreferredDocumentConversionServerUrl()
self.assertTrue(server_url == conversion_url or server_url == conversion_url1)
def testDocumentModuleMigration(self): def testDocumentModuleMigration(self):
""" """
...@@ -241,6 +243,8 @@ class TestSlapOSConfigurator(testOfficeJSAppstoreMixin): ...@@ -241,6 +243,8 @@ class TestSlapOSConfigurator(testOfficeJSAppstoreMixin):
'erp5_forge', 'erp5_forge',
'erp5_ui_test', 'erp5_ui_test',
'erp5_ui_test_core', 'erp5_ui_test_core',
'erp5_web_service',
'erp5_oauth2_resource',
'officejs_test' 'officejs_test'
] ]
self.assertSameSet(expected_business_template_list, self.assertSameSet(expected_business_template_list,
......
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
[buildout] [buildout]
extends = extends =
https://lab.nexedi.com/nexedi/slapos/raw/1.0.244/software/erp5/software.cfg https://lab.nexedi.com/nexedi/slapos/raw/1.0.339/software/erp5/software.cfg
parts += parts +=
officejs-appstore officejs-appstore
...@@ -10,22 +10,12 @@ repository_id_list += officejs-appstore ...@@ -10,22 +10,12 @@ repository_id_list += officejs-appstore
[local-bt5-repository] [local-bt5-repository]
list += ${officejs-appstore:location}/bt5 list += ${officejs-appstore:location}/bt5
#[erp5]
#branch =
#revision =
[officejs-appstore] [officejs-appstore]
<= erp5 <= erp5
repository = https://lab.nexedi.com/nexedi/officejs-appstore.git repository = https://lab.nexedi.com/nexedi/officejs-appstore.git
branch = branch =
revision = 2bec764b6d7d223997e6558cbb251b6233b6f70d revision = 47446f95ffad3094ccdb830772241b49f75d9567
[eggs] [eggs]
extra-paths += extra-paths +=
${officejs-appstore:location} ${officejs-appstore:location}
\ No newline at end of file
Zope2-patches +=
${officejs-appstore:location}/slapos/0001-Products-SiteAccess-handle-wildcard-on-rewrite-url.patch#d4aace37a645354aed02440c34dca629
[versions]
Zope2 =2.13.30+SlapOSPatched002
{
"name": "OfficeJS Appstore",
"description": "OfficeJS Appstore",
"serialisation": "json-in-xml",
"software-type": {
"default": {
"title": "Default",
"software-type": "default",
"request": "https://lab.nexedi.com/nexedi/slapos/raw/1.0.339/software/erp5/instance-erp5-input-schema.json",
"response": "https://lab.nexedi.com/nexedi/slapos/raw/1.0.339/software/erp5/instance-erp5-output-schema.json",
"index": 0
}
}
}
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