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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
9a990c22
Commit
9a990c22
authored
Mar 09, 2021
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-master: Merge minimal changes from stack/erp5
Partially updated from original instance-erp5.cfg.in file.
parent
3b846961
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
software/slapos-master/buildout.hash.cfg
software/slapos-master/buildout.hash.cfg
+1
-1
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+4
-4
No files found.
software/slapos-master/buildout.hash.cfg
View file @
9a990c22
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
# not need these here).
# not need these here).
[template-erp5]
[template-erp5]
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
8073c5e43b6ce1e1ebac1df4bf9eead1
md5sum =
f078d72db690805eab90a4577066b920
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
software/slapos-master/instance-erp5.cfg.in
View file @
9a990c22
...
@@ -249,8 +249,8 @@ config-tidstorage-port = ${request-zodb:connection-tidstorage-port}
...
@@ -249,8 +249,8 @@ config-tidstorage-port = ${request-zodb:connection-tidstorage-port}
{% endfor -%}
{% endfor -%}
software-type = zope
software-type = zope
{% set global_publi
cation_deadline = slapparameter_dict.get('publication-deadline
') -%}
{% set global_publi
sher_timeout = slapparameter_dict.get('publisher-timeout
') -%}
{% set global_activity_
deadline = slapparameter_dict.get('activity-deadline
') -%}
{% set global_activity_
timeout = slapparameter_dict.get('activity-timeout
') -%}
{% set zope_family_dict = {} -%}
{% set zope_family_dict = {} -%}
{% set zope_family_name_list = [] -%}
{% set zope_family_name_list = [] -%}
{% set zope_backend_path_dict = {} -%}
{% set zope_backend_path_dict = {} -%}
...
@@ -288,8 +288,8 @@ config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-thres
...
@@ -288,8 +288,8 @@ config-large-file-threshold = {{ dumps(zope_parameter_dict.get('large-file-thres
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
config-port-base = {{ dumps(zope_parameter_dict.get('port-base', 2200)) }}
{# BBB: zope_parameter_dict used to contain 'webdav', so fallback to it -#}
{# 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-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-publi
sher-timeout = {{ dumps(current_zope_family_override_dict.get('publisher-timeout', global_publisher_timeout
)) }}
config-activity-
deadline = {{ dumps(current_zope_family_override_dict.get('activity-deadline', global_activity_deadline
)) }}
config-activity-
timeout = {{ dumps(current_zope_family_override_dict.get('activity-timeout', global_activity_timeout
)) }}
{% if test_runner_enabled -%}
{% if test_runner_enabled -%}
config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-list}
config-test-runner-apache-url-list = ${publish-early:{{ zope_family }}-test-runner-url-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