Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Guillaume Hervier
slapos-caddy
Commits
01c8af3a
Commit
01c8af3a
authored
Aug 07, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5.zeo: rename instance parameter section for backups
parent
b79be2cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
software/erp5/instance-zeo-input-schema.json
software/erp5/instance-zeo-input-schema.json
+2
-2
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+1
-1
stack/erp5/instance-zeo.cfg.in
stack/erp5/instance-zeo.cfg.in
+2
-2
No files found.
software/erp5/instance-zeo-input-schema.json
View file @
01c8af3a
...
...
@@ -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"
:
{
"ti
dstorage-ti
mestamp-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"
...
...
stack/erp5/buildout.cfg
View file @
01c8af3a
...
...
@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d
[template-zeo]
< = download-base
filename = instance-zeo.cfg.in
md5sum =
4d2207931975e580d04d0b0506034564
md5sum =
0493e0a1f59b0364f47a8093d1aac580
[template-zope]
< = download-base
...
...
stack/erp5/instance-zeo.cfg.in
View file @
01c8af3a
...
...
@@ -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('ti
dstorage-ti
mestamp-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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment