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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Klaus Wölfel
slapos
Commits
8cffc02a
Commit
8cffc02a
authored
Feb 03, 2014
by
Vincent Pelletier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: Allow specifying a list of logins to receive Developer role.
parent
741c7ba3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
3 deletions
+24
-3
software/erp5/instance-erp5-input-schema.json
software/erp5/instance-erp5-input-schema.json
+10
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+3
-3
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+2
-0
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+1
-0
stack/erp5/zope.conf.in
stack/erp5/zope.conf.in
+8
-0
No files found.
software/erp5/instance-erp5-input-schema.json
View file @
8cffc02a
...
...
@@ -29,6 +29,16 @@
"default"
:
"random"
,
"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"
:
{
"description"
:
"Front-end slave instance request parameters"
,
"properties"
:
{
...
...
stack/erp5/buildout.cfg
View file @
8cffc02a
...
...
@@ -200,7 +200,7 @@ md5sum = 9622cc0a21b6caf9c9beb5efea3e1998
[template-zope-conf]
< = download-base
filename = zope.conf.in
md5sum =
c4c42d06c63d33de703fc03415e34d84
md5sum =
b54344ee94519f7e95e270664ba3dc99
[template-my-cnf]
< = download-base
...
...
@@ -286,7 +286,7 @@ extra-context =
[template-erp5]
< = download-base
filename = instance-erp5.cfg.in
md5sum =
b9157fea0060db385c143bd87ef2f12b
md5sum =
ff906bf25374a5d1ba272cd4f8ddd37c
[template-neo]
< = download-base
...
...
@@ -301,7 +301,7 @@ md5sum = 32de16140a294a7e456a9665124bdb93
[template-zope]
< = download-base
filename = instance-zope.cfg.in
md5sum =
f7479554d8b1f963f3b508da0367979f
md5sum =
d293450efd0bebc91c0bad5c1c7989bc
link-binary =
${aspell:location}/bin/aspell
${coreutils:location}/bin/basename
...
...
stack/erp5/instance-erp5.cfg.in
View file @
8cffc02a
...
...
@@ -89,6 +89,7 @@ extra-config =
deadlock-debugger-password
inituser-login
inituser-password
developer-list
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}
...
...
@@ -106,6 +107,7 @@ config-site-id = {{ site_id }}
config-deadlock-debugger-password = ${deadlock-debugger-password:passwd}
config-inituser-login = {{ dumps(inituser_login) }}
config-inituser-password = ${inituser-password:passwd}
config-developer-list = {{ dumps(slapparameter_dict.get('developer-list', [inituser_login])) }}
software-type = zope
{% set zope_family_dict = {} -%}
...
...
stack/erp5/instance-zope.cfg.in
View file @
8cffc02a
...
...
@@ -188,6 +188,7 @@ site-id = {{ site_id }}
{% do zodb_list.append([key, mount_point, cache_size, storage_type, storage_dict]) -%}
{% endfor -%}
zodb-list = {{ dumps(zodb_list) }}
developer-list = {{ dumps(slapparameter_dict['developer-list']) }}
[zope-conf-base]
recipe = slapos.recipe.template:jinja2
...
...
stack/erp5/zope.conf.in
View file @
8cffc02a
...
...
@@ -81,6 +81,14 @@ products {{ instance_products }}
container-class Products.TemporaryFolder.TemporaryContainer
</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'] -%}
<zodb_db {{ db_name }}>
{%- if cache_size >= 0 %}
...
...
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