Commit 8cffc02a authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Allow specifying a list of logins to receive Developer role.

parent 741c7ba3
...@@ -29,6 +29,16 @@ ...@@ -29,6 +29,16 @@
"default": "random", "default": "random",
"type": "string" "type": "string"
}, },
"developer-list": {
"description": "List of logins which should get the Developper role (required to modify portal_components' content)",
"default": "inituser-login's value",
"items": {
"pattern": "/^\S+$/",
"type": "string"
},
"uniqueItems": true,
"type": "array"
},
"frontend": { "frontend": {
"description": "Front-end slave instance request parameters", "description": "Front-end slave instance request parameters",
"properties": { "properties": {
......
...@@ -200,7 +200,7 @@ md5sum = 9622cc0a21b6caf9c9beb5efea3e1998 ...@@ -200,7 +200,7 @@ md5sum = 9622cc0a21b6caf9c9beb5efea3e1998
[template-zope-conf] [template-zope-conf]
< = download-base < = download-base
filename = zope.conf.in filename = zope.conf.in
md5sum = c4c42d06c63d33de703fc03415e34d84 md5sum = b54344ee94519f7e95e270664ba3dc99
[template-my-cnf] [template-my-cnf]
< = download-base < = download-base
...@@ -286,7 +286,7 @@ extra-context = ...@@ -286,7 +286,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = b9157fea0060db385c143bd87ef2f12b md5sum = ff906bf25374a5d1ba272cd4f8ddd37c
[template-neo] [template-neo]
< = download-base < = download-base
...@@ -301,7 +301,7 @@ md5sum = 32de16140a294a7e456a9665124bdb93 ...@@ -301,7 +301,7 @@ md5sum = 32de16140a294a7e456a9665124bdb93
[template-zope] [template-zope]
< = download-base < = download-base
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = f7479554d8b1f963f3b508da0367979f md5sum = d293450efd0bebc91c0bad5c1c7989bc
link-binary = link-binary =
${aspell:location}/bin/aspell ${aspell:location}/bin/aspell
${coreutils:location}/bin/basename ${coreutils:location}/bin/basename
......
...@@ -89,6 +89,7 @@ extra-config = ...@@ -89,6 +89,7 @@ extra-config =
deadlock-debugger-password deadlock-debugger-password
inituser-login inituser-login
inituser-password inituser-password
developer-list
config-mysql-url-list = ${request-mariadb:connection-database-list} config-mysql-url-list = ${request-mariadb:connection-database-list}
config-mysql-test-url-list = ${request-mariadb:connection-test-database-list} config-mysql-test-url-list = ${request-mariadb:connection-test-database-list}
config-memcached-url = ${request-memcached-volatile:connection-url} config-memcached-url = ${request-memcached-volatile:connection-url}
...@@ -106,6 +107,7 @@ config-site-id = {{ site_id }} ...@@ -106,6 +107,7 @@ config-site-id = {{ site_id }}
config-deadlock-debugger-password = ${deadlock-debugger-password:passwd} config-deadlock-debugger-password = ${deadlock-debugger-password:passwd}
config-inituser-login = {{ dumps(inituser_login) }} config-inituser-login = {{ dumps(inituser_login) }}
config-inituser-password = ${inituser-password:passwd} config-inituser-password = ${inituser-password:passwd}
config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
software-type = zope software-type = zope
{% set zope_family_dict = {} -%} {% set zope_family_dict = {} -%}
......
...@@ -188,6 +188,7 @@ site-id = {{ site_id }} ...@@ -188,6 +188,7 @@ site-id = {{ site_id }}
{% do zodb_list.append([key, mount_point, cache_size, storage_type, storage_dict]) -%} {% do zodb_list.append([key, mount_point, cache_size, storage_type, storage_dict]) -%}
{% endfor -%} {% endfor -%}
zodb-list = {{ dumps(zodb_list) }} zodb-list = {{ dumps(zodb_list) }}
developer-list = {{ dumps(slapparameter_dict['developer-list']) }}
[zope-conf-base] [zope-conf-base]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
...@@ -81,6 +81,14 @@ products {{ instance_products }} ...@@ -81,6 +81,14 @@ products {{ instance_products }}
container-class Products.TemporaryFolder.TemporaryContainer container-class Products.TemporaryFolder.TemporaryContainer
</zodb_db> </zodb_db>
{% set developer_list = parameter_dict['developer-list'] -%}
{% if developer_list -%}
%import Products.ERP5Type
<ERP5Type erp5>
developers {{ developer_list | join(' ') }}
</ERP5Type>
{%- endif %}
{% for db_name, mount_point, cache_size, storage_type, storage_dict in parameter_dict['zodb-list'] -%} {% for db_name, mount_point, cache_size, storage_type, storage_dict in parameter_dict['zodb-list'] -%}
<zodb_db {{ db_name }}> <zodb_db {{ db_name }}>
{%- if cache_size >= 0 %} {%- if cache_size >= 0 %}
......
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