Commit 0e946d70 authored by Tatuya Kamada's avatar Tatuya Kamada

erp5: Add dynamic instance home of zopes.

parent 61534249
...@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e ...@@ -74,7 +74,7 @@ md5sum = d41d8cd98f00b204e9800998ecf8427e
[template-erp5] [template-erp5]
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 83e69244728a0d323f535dd3e8b734b6 md5sum = 37f43c57353e0fa5f15f36846a45da8a
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
...@@ -82,7 +82,7 @@ md5sum = d8f70f5826315a402bf6d72744b80bd9 ...@@ -82,7 +82,7 @@ md5sum = d8f70f5826315a402bf6d72744b80bd9
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = d1257e7e942307be0a79e34aa4320e9f md5sum = 7415a758c1076888d675aca1d9440b22
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -186,6 +186,7 @@ name = {{ partition_name }} ...@@ -186,6 +186,7 @@ name = {{ partition_name }}
{{ root_common.sla(partition_name) }} {{ root_common.sla(partition_name) }}
config-name = {{ dumps(custom_name) }} config-name = {{ dumps(custom_name) }}
config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }} config-instance-count = {{ dumps(zope_parameter_dict.get('instance-count', 1)) }}
config-instance = {{ dumps(zope_parameter_dict.get('instance', {})) }}
config-private-dev-shm = {{ zope_parameter_dict.get('private-dev-shm', '') }} config-private-dev-shm = {{ zope_parameter_dict.get('private-dev-shm', '') }}
config-thread-amount = {{ dumps(zope_parameter_dict.get('thread-amount', 4)) }} config-thread-amount = {{ dumps(zope_parameter_dict.get('thread-amount', 4)) }}
config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }} config-timerserver-interval = {{ dumps(zope_parameter_dict.get('timerserver-interval', 5)) }}
......
...@@ -76,7 +76,7 @@ ca-crl = ${directory:test-ca-crl} ...@@ -76,7 +76,7 @@ ca-crl = ${directory:test-ca-crl}
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
bin = ${buildout:directory}/bin bin = ${buildout:directory}/bin
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
instance = ${:srv}/erp5shared instance = {{ slapparameter_dict.get('instance') or '${:srv}/erp5shared' }}
instance-constraint = ${:instance}/Constraint instance-constraint = ${:instance}/Constraint
instance-document = ${:instance}/Document instance-document = ${:instance}/Document
instance-etc = ${:instance}/etc instance-etc = ${:instance}/etc
......
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