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
Labels
Merge Requests
108
Merge Requests
108
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
c9ef610c
Commit
c9ef610c
authored
Feb 03, 2022
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/arnau-aurel-zope4' into zope4py3
parents
e3810127
9137f79e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
stack/erp5/instance-balancer.cfg.in
stack/erp5/instance-balancer.cfg.in
+1
-1
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+3
-3
No files found.
stack/erp5/instance-balancer.cfg.in
View file @
c9ef610c
...
@@ -307,7 +307,7 @@ certificate-and-key = ${directory:etc}/certificate-and-key-generated.pem
...
@@ -307,7 +307,7 @@ certificate-and-key = ${directory:etc}/certificate-and-key-generated.pem
promise = check_socket_listening
promise = check_socket_listening
name = haproxy.py
name = haproxy.py
config-host = {{ ipv4 }}
config-host = {{ ipv4 }}
config-port = {{
list(haproxy_dict.values())[0]
[0] }}
config-port = {{
next(six.itervalues(haproxy_dict))
[0] }}
[{{ section('publish') }}]
[{{ section('publish') }}]
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
...
...
stack/erp5/instance-erp5.cfg.in
View file @
c9ef610c
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
{% set partition_thread_count_list = [] -%}
{% set partition_thread_count_list = [] -%}
{% set zope_partition_dict = slapparameter_dict.get('zope-partition-dict', {'1': {}}) -%}
{% set zope_partition_dict = slapparameter_dict.get('zope-partition-dict', {'1': {}}) -%}
{% set zope_family_override_dict = slapparameter_dict.get('family-override', {}) -%}
{% set zope_family_override_dict = slapparameter_dict.get('family-override', {}) -%}
{% for zope_parameter_dict in
list(zope_partition_dict.values()
) -%}
{% for zope_parameter_dict in
six.itervalues(zope_partition_dict
) -%}
{# Apply some zope_parameter_dict default values, to avoid duplication. -#}
{# Apply some zope_parameter_dict default values, to avoid duplication. -#}
{% do zope_parameter_dict.setdefault('thread-amount', 4) -%}
{% do zope_parameter_dict.setdefault('thread-amount', 4) -%}
{% do zope_parameter_dict.setdefault('instance-count', 1) -%}
{% do zope_parameter_dict.setdefault('instance-count', 1) -%}
...
@@ -272,7 +272,7 @@ software-type = zope
...
@@ -272,7 +272,7 @@ software-type = zope
{% set zope_backend_path_dict = {} -%}
{% set zope_backend_path_dict = {} -%}
{% set ssl_authentication_dict = {} -%}
{% set ssl_authentication_dict = {} -%}
{% set jupyter_zope_family_default = [] -%}
{% set jupyter_zope_family_default = [] -%}
{% for custom_name, zope_parameter_dict in
zope_partition_dict.items(
) -%}
{% for custom_name, zope_parameter_dict in
six.iteritems(zope_partition_dict
) -%}
{% set partition_name = 'zope-' ~ custom_name -%}
{% set partition_name = 'zope-' ~ custom_name -%}
{% set section_name = 'request-' ~ partition_name -%}
{% set section_name = 'request-' ~ partition_name -%}
{% set promise_software_url_section_name = 'promise-software-url' ~ partition_name -%}
{% set promise_software_url_section_name = 'promise-software-url' ~ partition_name -%}
...
@@ -461,7 +461,7 @@ recipe = slapos.cookbook:publish.serialised
...
@@ -461,7 +461,7 @@ recipe = slapos.cookbook:publish.serialised
Pick any published hosts-dict, they are expected to be identical - and there is
Pick any published hosts-dict, they are expected to be identical - and there is
no way to check here.
no way to check here.
-#}
-#}
hosts-dict = {{ '${' ~
list(zope_address_list_id_dict)[0]
~ ':connection-hosts-dict}' }}
hosts-dict = {{ '${' ~
next(iter(zope_address_list_id_dict))
~ ':connection-hosts-dict}' }}
{% endif -%}
{% endif -%}
{% for name, value in publish_dict.items() -%}
{% for name, value in publish_dict.items() -%}
{{ name }} = {{ value }}
{{ name }} = {{ value }}
...
...
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