Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos-mynij-dev
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
Mynij
slapos-mynij-dev
Commits
812acb16
Commit
812acb16
authored
Apr 03, 2014
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixup! erp5.zope: Fix deadlock debugger password.
parent
c1effb31
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
3 deletions
+4
-3
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/erp5/zope.conf.in
stack/erp5/zope.conf.in
+2
-1
No files found.
stack/erp5/buildout.cfg
View file @
812acb16
...
@@ -207,7 +207,7 @@ md5sum = 6d52007d9bdc25ed0c83a49d63d59a18
...
@@ -207,7 +207,7 @@ md5sum = 6d52007d9bdc25ed0c83a49d63d59a18
[template-zope-conf]
[template-zope-conf]
< = download-base
< = download-base
filename = zope.conf.in
filename = zope.conf.in
md5sum =
ef754491384c3298790383b73e7fbed3
md5sum =
5de6360fa1989750a92f51e06427d4f7
[template-my-cnf]
[template-my-cnf]
< = download-base
< = download-base
...
@@ -234,7 +234,7 @@ md5sum = a88881e00d56286e16fcaf36d94c025e
...
@@ -234,7 +234,7 @@ md5sum = a88881e00d56286e16fcaf36d94c025e
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 86c86ef2b275ec8699723bd361a37bc
0
md5sum = 86c86ef2b275ec8699723bd361a37bc
2
extra-context =
extra-context =
key mariadb_link_binary template-mariadb:link-binary
key mariadb_link_binary template-mariadb:link-binary
key zope_link_binary template-zope:link-binary
key zope_link_binary template-zope:link-binary
...
...
stack/erp5/zope.conf.in
View file @
812acb16
...
@@ -44,9 +44,10 @@ products {{ parameter_dict['instance-products'] }}
...
@@ -44,9 +44,10 @@ products {{ parameter_dict['instance-products'] }}
secret {{ parameter_dict['deadlock-debugger-password'] }}
secret {{ parameter_dict['deadlock-debugger-password'] }}
</product-config>
</product-config>
{% set tidstorage_ip = parameter_dict['tidstorage-ip'] -%}
{% if tidstorage_ip -%}
{% if tidstorage_ip -%}
<product-config TIDStorage>
<product-config TIDStorage>
backend-ip {{
parameter_dict['tidstorage-ip']
}}
backend-ip {{
tidstorage_ip
}}
backend-port {{ parameter_dict['tidstorage-port'] }}
backend-port {{ parameter_dict['tidstorage-port'] }}
</product-config>
</product-config>
...
...
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