Commit 627ed397 authored by Julien Muchembled's avatar Julien Muchembled

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

This follows up commit 04ff4930
parent d0aa4805
......@@ -24,8 +24,8 @@
"default": {},
"patternProperties": {
".*": {
"description": "'%(backup)s' is expanded to partition's ZODB backup path (typically 'srv/backup/zodb')",
"default": "%(backup)s/<export identifier>",
"description": "'%(backup)s' is expanded to partition's ZODB backup path (typically 'srv/backup/zodb'), and %(name)s with the export id",
"default": "%(backup)s/%(name)s",
"type": "string"
}
},
......
......@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d
[template-zeo]
< = download-base
filename = instance-zeo.cfg.in
md5sum = 6d6665595c08883c4f075dd3d176dc02
md5sum = 32de16140a294a7e456a9665124bdb93
[template-zope]
< = download-base
......
......@@ -70,7 +70,7 @@ ipv6 = {{ ipv6 }}
{% do known_tid_storage_identifier_dict.__setitem__(
json_module.dumps((known_tid_storage_identifier_host, export_id)), (
export_storage_dict['path'],
tidstorage_dict.get('zodb-dict', {}).get(export_id, '%(backup)s/' ~ export_id) % {'backup': zodb_backup_path},
tidstorage_dict.get('zodb-dict', {}).get(export_id, '%(backup)s/%(name)s') % {'backup': zodb_backup_path, 'name': export_id},
mount_point,
),
) -%}
......
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