Commit 70f2b96d authored by Vincent Pelletier's avatar Vincent Pelletier

stack.erp5: Rework resilience exclusion lists.

Whitespaces matter to exporter.exclude:
- patterns must *not* start with a space
- file *must* end with a newline

Also, de-duplicate paths.
parent 8410dd67
...@@ -19,15 +19,15 @@ md5sum = 1e89de954d816b93f76d9b75820d192c ...@@ -19,15 +19,15 @@ md5sum = 1e89de954d816b93f76d9b75820d192c
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = 6cc8f361b3ca22aab2611231fcad8b2d md5sum = e8c5a6669c0d3b6f05065146a7fc40f0
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
md5sum = 42d2a2c7cb5bf5122b6cfd8f53a5576f md5sum = 579bfcc29802bbead021a1a79ed569b1
[template-cloudooo] [template-cloudooo]
filename = instance-cloudoo.cfg.in filename = instance-cloudoo.cfg.in
md5sum = c553bbcdc5f80d893907a05acefc1356 md5sum = b9197d7fa0cd5ce0656032b55d3b185b
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
...@@ -83,7 +83,7 @@ md5sum = 14ec590eaaebc90113f1c589ea8dd444 ...@@ -83,7 +83,7 @@ md5sum = 14ec590eaaebc90113f1c589ea8dd444
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
md5sum = 7610bafda245c008ccf0b6ea58ce21c2 md5sum = dba1a42bfcc8a9a2cc4e8ac503200e63
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
......
...@@ -57,9 +57,10 @@ service-folder = ${directory:service} ...@@ -57,9 +57,10 @@ service-folder = ${directory:service}
[resiliency-exclude-file] [resiliency-exclude-file]
# Generate rdiff exclude file in case of resiliency # Generate rdiff exclude file in case of resiliency
recipe = collective.recipe.template recipe = slapos.recipe.template:jinja2
input = inline: ** mode = 644
output = ${directory:srv}/exporter.exclude template = {{ 'inline:{{ "**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[promise] [promise]
recipe = slapos.cookbook:check_port_listening recipe = slapos.cookbook:check_port_listening
......
...@@ -77,9 +77,10 @@ kumofs-data = ${:srv}/kumofs ...@@ -77,9 +77,10 @@ kumofs-data = ${:srv}/kumofs
[resiliency-exclude-file] [resiliency-exclude-file]
# Generate rdiff exclude file in case of resiliency # Generate rdiff exclude file in case of resiliency
recipe = collective.recipe.template recipe = slapos.recipe.template:jinja2
input = inline: ** mode = 644
output = ${directory:srv}/exporter.exclude template = {{ 'inline:{{ "**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
# Deploy zope promises scripts # Deploy zope promises scripts
[promise-template] [promise-template]
......
...@@ -247,9 +247,10 @@ run = ${:var}/run ...@@ -247,9 +247,10 @@ run = ${:var}/run
[resiliency-exclude-file] [resiliency-exclude-file]
# Generate rdiff exclude file in case of resiliency # Generate rdiff exclude file in case of resiliency
recipe = collective.recipe.template recipe = slapos.recipe.template:jinja2
input = inline: srv/mariadb/** mode = 644
output = ${directory:srv}/exporter.exclude template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[resiliency-after-import-script] [resiliency-after-import-script]
# Generate after import script used by importer instance of webrunner # Generate after import script used by importer instance of webrunner
......
...@@ -118,9 +118,10 @@ tidstorage-port = ...@@ -118,9 +118,10 @@ tidstorage-port =
# webrunner resiliency with erp5 inside. # webrunner resiliency with erp5 inside.
[{{ section("resiliency-exclude-file") }}] [{{ section("resiliency-exclude-file") }}]
# Generate rdiff exclude file # Generate rdiff exclude file
recipe = collective.recipe.template recipe = slapos.recipe.template:jinja2
input = inline: srv/zodb/** mode = 644
output = ${directory:srv}/exporter.exclude template = {{ 'inline:{{ "${directory:zodb}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-after-import-script") }}] [{{ section("resiliency-after-import-script") }}]
# Generate after import script used by importer instance of webrunner # Generate after import script used by importer instance of webrunner
......
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