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
Labels
Merge Requests
104
Merge Requests
104
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
0503a5e5
Commit
0503a5e5
authored
Jul 28, 2015
by
Tatuya Kamada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: Add dynamic instance home.
parent
615c9000
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
4 deletions
+6
-4
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+2
-2
stack/erp5/instance-erp5.cfg.in
stack/erp5/instance-erp5.cfg.in
+2
-0
stack/erp5/zope.conf.in
stack/erp5/zope.conf.in
+2
-2
No files found.
stack/erp5/buildout.cfg
View file @
0503a5e5
...
...
@@ -192,7 +192,7 @@ md5sum = 050fa6ff4eb397c5d4cb41a9f75afb3f
[template-zope-conf]
< = download-base
filename = zope.conf.in
md5sum = 0
bf51218ecbf2bd319214192448a3ef7
md5sum = 0
4b40d4729fec7dd528b53dab47439bf
[template-runzope-userhosts-preloaded]
< = download-base
...
...
@@ -296,7 +296,7 @@ extra-context =
[template-erp5]
< = download-base
filename = instance-erp5.cfg.in
md5sum =
55ccb85dd3334d6c07b49a6f1c11ace9
md5sum =
463464456c2ed9d761e8a954de02e9e0
[template-zeo]
< = download-base
...
...
stack/erp5/instance-erp5.cfg.in
View file @
0503a5e5
...
...
@@ -127,6 +127,8 @@ name = {{ partition_name }}
{{ sla(partition_name) }}
config-name = {{ dumps(custom_name) }}
config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }}
config-my-instance = {{ dumps(zope_parameter_dict.get('instance', False)) }}
config-my-instance-product = {{ dumps(zope_parameter_dict.get('instance-product', False)) }}
config-thread-amount = {{ dumps(zope_parameter_dict.get('thread-amount', 4)) }}
config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }}
config-longrequest-logger-interval = {{ dumps(zope_parameter_dict.get('longrequest-logger-interval', -1)) }}
...
...
stack/erp5/zope.conf.in
View file @
0503a5e5
# Note: Environment is setup in running wrapper script, as zope.conf is read
# too late for some components.
%define INSTANCE {{ parameter_dict
['instance']
}}
%define INSTANCE {{ parameter_dict
.get('my-instance', parameter_dict['instance'])
}}
instancehome $INSTANCE
zserver-threads {{ parameter_dict['thread-amount'] }}
# When ownership checking is enabled, the roles a script runs as are the
...
...
@@ -20,7 +20,7 @@ rest-input-encoding utf-8
rest-output-encoding utf-8
# XXX: isn't this entry implicit ?
products {{ parameter_dict
['instance-products']
}}
products {{ parameter_dict
.get('my-instance-products' ,parameter_dict['instance-products'])
}}
{% if parameter_dict['webdav'] -%}
<webdav-source-server>
...
...
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