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
627ed397
Commit
627ed397
authored
Sep 03, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5.zeo: replace %(name)s with the export id in instanciation parameters for backup
This follows up commit
04ff4930
parent
d0aa4805
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
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
+1
-1
No files found.
software/erp5/instance-zeo-input-schema.json
View file @
627ed397
...
...
@@ -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"
}
},
...
...
stack/erp5/buildout.cfg
View file @
627ed397
...
...
@@ -279,7 +279,7 @@ md5sum = 7735d535aa34dfdc18a776b80bc0ca3d
[template-zeo]
< = download-base
filename = instance-zeo.cfg.in
md5sum =
6d6665595c08883c4f075dd3d176dc02
md5sum =
32de16140a294a7e456a9665124bdb93
[template-zope]
< = download-base
...
...
stack/erp5/instance-zeo.cfg.in
View file @
627ed397
...
...
@@ -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,
),
) -%}
...
...
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