Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
slapos
Commits
cd917cc3
Commit
cd917cc3
authored
Mar 09, 2021
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
stack/erp5/: Stick to zope conf naming.
parent
720cfa26
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
20 additions
and
20 deletions
+20
-20
software/erp5/instance-erp5-input-schema.json
software/erp5/instance-erp5-input-schema.json
+6
-6
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+3
-3
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+4
-4
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+2
-2
stack/erp5/zope.conf.in
stack/erp5/zope.conf.in
+5
-5
No files found.
software/erp5/instance-erp5-input-schema.json
View file @
cd917cc3
...
...
@@ -81,12 +81,12 @@
"uniqueItems"
:
true
,
"type"
:
"array"
},
"activity-
deadline
"
:
{
"activity-
timeout
"
:
{
"description"
:
"How long a CMFActivity-initiated transaction may last, in seconds"
,
"default"
:
null
,
"type"
:
[
"number"
,
"null"
]
},
"publi
cation-deadline
"
:
{
"publi
sher-timeout
"
:
{
"description"
:
"How long a publisher-initiated transaction may last, in seconds"
,
"default"
:
null
,
"type"
:
[
"number"
,
"null"
]
...
...
@@ -103,12 +103,12 @@
"default"
:
false
,
"type"
:
"boolean"
},
"activity-
deadline
"
:
{
"description"
:
"Override global activity
deadline
"
,
"activity-
timeout
"
:
{
"description"
:
"Override global activity
timeout
"
,
"type"
:
[
"number"
,
"null"
]
},
"publi
cation-deadline
"
:
{
"description"
:
"Override global publi
cation deadline
"
,
"publi
sher-timeout
"
:
{
"description"
:
"Override global publi
sher timeout
"
,
"type"
:
[
"number"
,
"null"
]
}
},
...
...
stack/erp5/buildout.hash.cfg
View file @
cd917cc3
...
...
@@ -34,7 +34,7 @@ md5sum = e91c0fbd0df441884f7422fa7976053c
[template-zope-conf]
filename = zope.conf.in
md5sum =
2631a576ffe74c9e6a08cc0a16883765
md5sum =
5ce9d5e99880d5db9ed339bbefe28d34
[site-zcml]
filename = site.zcml
...
...
@@ -74,7 +74,7 @@ md5sum = b5ac16fdeed8863e465e955ba6d1e12a
[template-erp5]
filename = instance-erp5.cfg.in
md5sum =
852cad92ad2ec3d5dbd2f94efae2b40
1
md5sum =
ac155f28a096747fc267f32a1cec46e
1
[template-zeo]
filename = instance-zeo.cfg.in
...
...
@@ -82,7 +82,7 @@ md5sum = 0648e38bd5d3a15bb9f93264932740b9
[template-zope]
filename = instance-zope.cfg.in
md5sum = 9
8b3032baaaf424527be0b106d1f48e6
md5sum = 9
fa66b93fbf6a40aa8136c651ad9f539
[template-balancer]
filename = instance-balancer.cfg.in
...
...
stack/erp5/instance-erp5.cfg.in
View file @
cd917cc3
...
...
@@ -254,8 +254,8 @@ config-tidstorage-port = ${request-zodb:connection-tidstorage-port}
{% endfor -%}
software-type = zope
{% set global_publi
cation_deadline = slapparameter_dict.get('publication-deadline
') -%}
{% set global_activity_
deadline = slapparameter_dict.get('activity-deadline
') -%}
{% set global_publi
sher_timeout = slapparameter_dict.get('publisher-timeout
') -%}
{% set global_activity_
timeout = slapparameter_dict.get('activity-timeout
') -%}
{% set zope_family_dict = {} -%}
{% set zope_family_name_list = [] -%}
{% set zope_backend_path_dict = {} -%}
...
...
@@ -293,8 +293,8 @@ config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-thres
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
{# BBB: zope_parameter_dict used to contain 'webdav', so fallback to it -#}
config-webdav = {{ dumps(current_zope_family_override_dict.get('webdav', zope_parameter_dict.get('webdav', False))) }}
config-publi
cation-deadline = {{ dumps(current_zope_family_override_dict.get('publication-deadline', global_publication_deadline
)) }}
config-activity-
deadline = {{ dumps(current_zope_family_override_dict.get('activity-deadline', global_activity_deadline
)) }}
config-publi
sher-timeout = {{ dumps(current_zope_family_override_dict.get('publisher-timeout', global_publisher_timeout
)) }}
config-activity-
timeout = {{ dumps(current_zope_family_override_dict.get('activity-timeout', global_activity_timeout
)) }}
{% if test_runner_enabled -%}
config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
...
...
stack/erp5/instance-zope.cfg.in
View file @
cd917cc3
...
...
@@ -276,8 +276,8 @@ cloudooo-url = {{ (cloudooo if cloudooo.port == None else
{% endif -%}
{% endfor -%}
developer-list = {{ dumps(slapparameter_dict['developer-list']) }}
publi
cation-deadline = {{ dumps(slapparameter_dict['publication-deadline
']) }}
activity-
deadline = {{ dumps(slapparameter_dict['activity-deadline
']) }}
publi
sher-timeout = {{ dumps(slapparameter_dict['publisher-timeout
']) }}
activity-
timeout = {{ dumps(slapparameter_dict['activity-timeout
']) }}
instance = ${directory:instance}
instance-products = ${directory:instance-products}
deadlock-path = /manage_debug_threads
...
...
stack/erp5/zope.conf.in
View file @
cd917cc3
...
...
@@ -140,14 +140,14 @@ large-file-threshold {{ parameter_dict['large-file-threshold'] }}
</zodb_db>
{% set developer_list = parameter_dict['developer-list'] -%}
{% set publi
cation_deadline = parameter_dict['publication-deadline
'] -%}
{% set activity_
deadline = parameter_dict['activity-deadline
'] -%}
{% if developer_list or publi
cation_deadline or activity_deadline
-%}
{% set publi
sher_timeout = parameter_dict['publisher-timeout
'] -%}
{% set activity_
timeout = parameter_dict['activity-timeout
'] -%}
{% if developer_list or publi
sher_timeout or activity_timeout
-%}
%import Products.ERP5Type
<ERP5Type erp5>
{% if developer_list %}developers {{ developer_list | join(' ') }}{% endif %}
{% if publi
cation_deadline %}publisher-timeout {{ publication_deadline
}}{% endif %}
{% if activity_
deadline %}activity-timeout {{ activity_deadline
}}{% endif %}
{% if publi
sher_timeout %}publisher-timeout {{ publisher_timeout
}}{% endif %}
{% if activity_
timeout %}activity-timeout {{ activity_timeout
}}{% endif %}
</ERP5Type>
{% endif -%}
...
...
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