Commit 92be02bb authored by Julien Muchembled's avatar Julien Muchembled

erp5: make deadlock debugger password global and configurable

Before, a random password was generated for each group of zopes.
parent 04ff4930
......@@ -14,6 +14,11 @@
"default": "UTC",
"type": "string"
},
"deadlock-debugger-password": {
"description": "Password for /manage_debug_threads",
"default": "random",
"type": "string"
}
"zope-partition-dict": {
"description": "Zope layout definition",
"patternProperties": {
......
......@@ -269,7 +269,7 @@ extra-context =
[template-erp5]
< = download-base
filename = instance-erp5.cfg.in
md5sum = 2af91840ad030099cca9306c556acc10
md5sum = 429f14ef4ef266fb077d0be1cb8b8887
[template-neo]
< = download-base
......@@ -284,7 +284,7 @@ md5sum = ae4560ecbd748de5a1e0b10932d9be05
[template-zope]
< = download-base
filename = instance-zope.cfg.in
md5sum = 5be0b7da2ce4957ab990e2bdd9b54928
md5sum = e1764e796fc8335aac4704bdc2956c35
link-binary =
${coreutils:location}/bin/basename
${coreutils:location}/bin/cat
......
......@@ -44,6 +44,14 @@ config-{{ option }} = {{ dumps(value) }}
{{ request('mariadb', 'mariadb', 'mariadb', {'tcpv4-port': 2099}, {'database-list': True, 'test-database-list': True}) }}
{{ request('zodb', 'zodb-' ~ slapparameter_dict.get('zodb-software-type', 'zeo'), 'zodb', {'tcpv4-port': 2100, 'zodb-dict': {'root': {}}}, {'zodb-storage-type': False, 'zodb-dict': False, 'tidstorage-ip': False, 'tidstorage-port': False}) }}
[deadlock-debugger-password]
{% set deadlock_debugger_password = slapparameter_dict.get('deadlock-debugger-password') -%}
{% if deadlock_debugger_password -%}
passwd = {{ deadlock_debugger_password }}
{% else -%}
recipe = slapos.cookbook:generate.password
{% endif -%}
[request-zope-base]
< = request-common
return =
......@@ -69,6 +77,7 @@ extra-config =
longrequest-logger-interval
longrequest-logger-timeout
port-base
deadlock-debugger-password
config-mysql-url-list = ${request-mariadb:connection-database-list}
config-mysql-test-url-list = ${request-mariadb:connection-test-database-list}
config-memcached-url = ${request-memcached-volatile:connection-url}
......@@ -83,6 +92,7 @@ config-tidstorage-ip = ${request-zodb:connection-tidstorage-ip}
config-tidstorage-port = ${request-zodb:connection-tidstorage-port}
config-timezone = {{ slapparameter_dict.get('timezone', 'UTC') }}
config-site-id = {{ site_id }}
config-deadlock-debugger-password = ${deadlock-debugger-password:passwd}
software-type = zope
{% set zope_family_dict = {} -%}
......
......@@ -179,9 +179,6 @@ inituser = ${directory:instance}/inituser
runzope-binary = {{ bin_directory }}/runzope
bt5-repository-list =
[deadlock-debugger-password]
recipe = slapos.cookbook:generate.password
[zope-conf-parameter-base]
ip = {{ ipv4 }}
site-id = {{ site_id }}
......@@ -199,7 +196,7 @@ context =
key instance directory:instance
key instance_products directory:instance-products
raw deadlock_path /manage_debug_threads
key deadlock_debugger_password deadlock-debugger-password:passwd
raw deadlock_debugger_password {{ slapparameter_dict['deadlock-debugger-password'] }}
key tidstorage_ip tidstorage:ipv4
key tidstorage_port tidstorage:ipv4-port
key promise_path erp5-promise:promise-path
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment