erp5: Add dynamic instance home.

stack/erp5/buildout.cfg

@@ -192,7 +192,7 @@ md5sum = 050fa6ff4eb397c5d4cb41a9f75afb3f
 [template-zope-conf]
 < = download-base
 filename = zope.conf.in
-md5sum = 0bf51218ecbf2bd319214192448a3ef7
+md5sum = 04b40d4729fec7dd528b53dab47439bf
 
 [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

@@ -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

 # 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>