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
Léo-Paul Géneau
slapos
Commits
3d526ee6
Commit
3d526ee6
authored
Aug 20, 2019
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-master: follow up changes on ERP5 stack
parent
dcfbf929
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-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
+7
-4
No files found.
software/slapos-master/buildout.hash.cfg
View file @
3d526ee6
...
@@ -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 =
1c8cf3013bd8a4b05e62a8742089c59b
md5sum =
7f3318aec3b682c3379609ccdd659411
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
...
...
software/slapos-master/instance-erp5.cfg.in
View file @
3d526ee6
...
@@ -442,7 +442,7 @@ recipe = slapos.cookbook:publish-early
...
@@ -442,7 +442,7 @@ recipe = slapos.cookbook:publish-early
{%- endif %}
{%- endif %}
{%- if test_runner_enabled %}
{%- if test_runner_enabled %}
{%- for zope_family_name in zope_family_name_list %}
{%- for zope_family_name in zope_family_name_list %}
{{ zope_family_name }}-test-runner-url-list default-balancer-test-runner-url-list:
default
{{ zope_family_name }}-test-runner-url-list default-balancer-test-runner-url-list:
{{ zope_family_name }}
{%- endfor %}
{%- endfor %}
{%- endif %}
{%- endif %}
{%- if neo %}
{%- if neo %}
...
@@ -458,12 +458,15 @@ inituser-password = {{ dumps(inituser_password) }}
...
@@ -458,12 +458,15 @@ inituser-password = {{ dumps(inituser_password) }}
{%- set deadlock_debugger_password = slapparameter_dict.get('deadlock-debugger-password') -%}
{%- set deadlock_debugger_password = slapparameter_dict.get('deadlock-debugger-password') -%}
{%- if deadlock_debugger_password %}
{%- if deadlock_debugger_password %}
deadlock-debugger-password = {{ dumps(deadlock_debugger_password) }}
deadlock-debugger-password = {{ dumps(deadlock_debugger_password) }}
{%- endif %}
{% endif %}
{%- if test_runner_enabled %}
[default-balancer-test-runner-url-list]
[default-balancer-test-runner-url-list]
recipe =
recipe =
default = not-ready
{%- for zope_family_name in zope_family_name_list %}
{{ zope_family_name }} = not-ready
{%- endfor %}
{%- endif %}
[gen-password]
[gen-password]
recipe = slapos.cookbook:generate.password
recipe = slapos.cookbook:generate.password
...
...
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