Commit 01c8af3a authored by Julien Muchembled's avatar Julien Muchembled

erp5.zeo: rename instance parameter section for backups

parent b79be2cf
......@@ -10,7 +10,7 @@
"description": "Start allocating ports at this value, going upward"
}]
},
"tidstorage-dict": {
"backup": {
"description": "Controls ZODB backup generation and retention (disabled if null)",
"default": {},
"properties": {
......@@ -26,7 +26,7 @@
},
"type": "object"
},
"timestamp-path": {
"tidstorage-timestamp-path": {
"description": "Path to backup timestamp file, occurrences of '%(backup)s' being eplaced with the path to partition's srv/backup/tidstorage directory",
"default": "%(backup)s/repozo_tidstorage_timestamp.log",
"type": "string"
......
......@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d
[template-zeo]
< = download-base
filename = instance-zeo.cfg.in
md5sum = 4d2207931975e580d04d0b0506034564
md5sum = 0493e0a1f59b0364f47a8093d1aac580
[template-zope]
< = download-base
......
......@@ -4,7 +4,7 @@
{% set part_list = [] -%}
{% set storage_dict = {} -%}
{% set zodb_dict = {} -%}
{% set tidstorage_dict = slapparameter_dict.get('tidstorage-dict', {}) -%}
{% set tidstorage_dict = slapparameter_dict.get('backup', {}) -%}
{% set known_tid_storage_identifier_dict = {} -%}
{% set default_zodb_path = buildout_directory ~ '/srv/zodb' -%}
{% set zodb_backup_path = buildout_directory ~ '/srv/backup/zodb' -%}
......@@ -127,7 +127,7 @@ known-tid-storage-identifier-dict = {{ dumps(known_tid_storage_identifier_dict)
configuration-path = ${directory:etc}/tidstorage.py
ip = {{ tidstorage_ip }}
port = {{ tidstorage_port }}
timestamp-file-path = {{ tidstorage_dict.get('timestamp-path', '%(backup)s/repozo_tidstorage_timestamp.log' % {'backup': default_tidstorage_timestamp_path}) }}
timestamp-file-path = {{ tidstorage_dict.get('tidstorage-timestamp-path', '%(backup)s/repozo_tidstorage_timestamp.log' % {'backup': default_tidstorage_timestamp_path}) }}
logfile-name = ${directory:log}/tidstorage.log
pidfile-name = ${directory:run}/tidstorage.pid
status-file = ${directory:tidstorage}/tidstorage.tid
......
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