Commit 04ff4930 authored by Julien Muchembled's avatar Julien Muchembled

erp5.zeo: replace %(name)s with the export id in instanciation parameters

parent 63a48a82
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
"default": {}, "default": {},
"properties": { "properties": {
"path": { "path": {
"description": "FileStorage file path, '%(zodb)s' occurrences are replaced with the path to partition's srv/zodb directory", "description": "FileStorage file path, '%(zodb)s' occurrences are replaced with the path to partition's srv/zodb directory, and %(name)s with the export id",
"default": "%(zodb)s/<export identifier>.fs", "default": "%(zodb)s/%(name)s.fs",
"type": "string" "type": "string"
}, },
"client": { "client": {
......
...@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d ...@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d
[template-zeo] [template-zeo]
< = download-base < = download-base
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
md5sum = d3fe0fbf75334cd6fa11cc250ef4e1d6 md5sum = ae4560ecbd748de5a1e0b10932d9be05
[template-zope] [template-zope]
< = download-base < = download-base
......
...@@ -58,7 +58,7 @@ ipv6 = {{ ipv6 }} ...@@ -58,7 +58,7 @@ ipv6 = {{ ipv6 }}
{% set known_tid_storage_identifier_host = ((ipv4, next_port), ) -%} {% set known_tid_storage_identifier_host = ((ipv4, next_port), ) -%}
{% set client_dict = {} -%} {% set client_dict = {} -%}
{% for export_id, mount_point, cache_size, export_storage_dict in export_list -%} {% for export_id, mount_point, cache_size, export_storage_dict in export_list -%}
{% do export_storage_dict.__setitem__('path', export_storage_dict.get('path', '%(zodb)s/' ~ export_id ~ '.fs') % {'zodb': default_zodb_path}) -%} {% do export_storage_dict.__setitem__('path', export_storage_dict.get('path', '%(zodb)s/%(name)s.fs') % {'zodb': default_zodb_path, 'name': export_id}) -%}
{% do client_dict.update(export_storage_dict.get('client', {})) -%} {% do client_dict.update(export_storage_dict.get('client', {})) -%}
{% do client_dict.__setitem__('storage', export_id) -%} {% do client_dict.__setitem__('storage', export_id) -%}
{# XXX: I would like to raise if export_id is present in zodb_dict -#} {# XXX: I would like to raise if export_id is present in zodb_dict -#}
......
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