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
f7303597
Commit
f7303597
authored
Jun 07, 2018
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ERP5: fix backup-periodicity=never (ZEO)
parent
feb4d929
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
14 deletions
+16
-14
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+1
-1
stack/erp5/instance-zeo.cfg.in
stack/erp5/instance-zeo.cfg.in
+15
-13
No files found.
stack/erp5/buildout.hash.cfg
View file @
f7303597
...
@@ -79,7 +79,7 @@ md5sum = 9f8851af5faed9d1e346d7dbe0e6db5d
...
@@ -79,7 +79,7 @@ md5sum = 9f8851af5faed9d1e346d7dbe0e6db5d
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
md5sum =
d1f33d406d528ae27d973e2dd0efb1ba
md5sum =
3e650915959ff31c9c13c84069bbcd35
[template-zope]
[template-zope]
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
...
...
stack/erp5/instance-zeo.cfg.in
View file @
f7303597
...
@@ -65,6 +65,7 @@ path = ${directory:promises}/zeo-{{ family }}
...
@@ -65,6 +65,7 @@ path = ${directory:promises}/zeo-{{ family }}
{% set known_tid_storage_identifier_dict = () %}
{% set known_tid_storage_identifier_dict = () %}
{% set tidstorage_repozo_path = '' -%}
{% set tidstorage_repozo_path = '' -%}
{% else -%}
{% else -%}
[tidstorage]
[tidstorage]
recipe = slapos.cookbook:tidstorage
recipe = slapos.cookbook:tidstorage
known-tid-storage-identifier-dict = {{ dumps(known_tid_storage_identifier_dict) }}
known-tid-storage-identifier-dict = {{ dumps(known_tid_storage_identifier_dict) }}
...
@@ -101,19 +102,6 @@ cron-entries = ${cron:cron-entries}
...
@@ -101,19 +102,6 @@ cron-entries = ${cron:cron-entries}
name = tidstorage
name = tidstorage
time = {{ dumps(backup_periodicity) }}
time = {{ dumps(backup_periodicity) }}
command = ${tidstorage:repozo-wrapper}
command = ${tidstorage:repozo-wrapper}
{% endif -%}
[publish]
recipe = slapos.cookbook:publish.serialised
storage-dict = {{ dumps(storage_dict) }}
{% if len(known_tid_storage_identifier_dict) > 1 -%}
tidstorage-ip = ${tidstorage:ip}
tidstorage-port = ${tidstorage:port}
{% else -%}
tidstorage-ip =
tidstorage-port =
{% endif -%}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
# Used for ERP5 resiliency or (more probably)
# Used for ERP5 resiliency or (more probably)
# webrunner resiliency with erp5 inside.
# webrunner resiliency with erp5 inside.
...
@@ -168,6 +156,20 @@ input = inline: #!/bin/sh
...
@@ -168,6 +156,20 @@ input = inline: #!/bin/sh
output = ${directory:srv}/runner-import-restore
output = ${directory:srv}/runner-import-restore
mode = 755
mode = 755
{% endif -%}
[publish]
recipe = slapos.cookbook:publish.serialised
storage-dict = {{ dumps(storage_dict) }}
{% if len(known_tid_storage_identifier_dict) > 1 -%}
tidstorage-ip = ${tidstorage:ip}
tidstorage-port = ${tidstorage:port}
{% else -%}
tidstorage-ip =
tidstorage-port =
{% endif -%}
monitor-base-url = ${monitor-publish-parameters:monitor-base-url}
[directory]
[directory]
recipe = slapos.cookbook:mkdirectory
recipe = slapos.cookbook:mkdirectory
bin = ${buildout:directory}/bin
bin = ${buildout:directory}/bin
...
...
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