Commit c871585a authored by Nicolas Wavrant's avatar Nicolas Wavrant

erp5: respect syntax of exporter.exclude files

parent 4cfabf73
No related merge requests found
......@@ -27,7 +27,7 @@ md5sum = c005cfef03a0c2e504fcfa075e59934a
[template-caucase]
filename = instance-caucase.cfg.jinja2.in
md5sum = 799f8c8cc26188fae85afa0577a2d547
md5sum = 589a0ad37abc28cf6e34e406e7b83eec
[instance-caucase]
filename = instance.cfg.in
......
......@@ -229,7 +229,7 @@ init-user = admin
recipe = slapos.recipe.template:jinja2
mode = 644
template = inline:
${directory:log}
${directory:log}/**
rendered = ${directory:srv}/exporter.exclude
{% do part_list.append('resiliency-exclude-file') -%}
......
......@@ -26,7 +26,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
[template-mariadb]
filename = instance-mariadb.cfg.in
md5sum = 021dd2366b05fdab02302c59b51838d6
md5sum = 5455daf82dbd3bb0ab30776c490b7d60
[template-kumofs]
filename = instance-kumofs.cfg.in
......@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
[template-postfix]
filename = instance-postfix.cfg.in
md5sum = 9f504c280df638520ed416cbc3a93f41
md5sum = 805d997fcac266b0958c1c385729b32d
[template-postfix-master-cf]
filename = postfix_master.cf.in
......@@ -78,15 +78,15 @@ md5sum = f723acac5c081c7f9e5eff268d05cc54
[template-zeo]
filename = instance-zeo.cfg.in
md5sum = 52ef44b299e09ee65bdc5b23927f582b
md5sum = f9151066df96527d4c7f75c3079b2c10
[template-zope]
filename = instance-zope.cfg.in
md5sum = 9ddbba307b4df8ca316de940ba3b44f6
md5sum = b513678ffccb927d147fc4e0dda30dd5
[template-balancer]
filename = instance-balancer.cfg.in
md5sum = 213e9b4ad6350a18a276200b03e50d0c
md5sum = 016c56374566b8ea2a1cdb7c8ada3ea7
[template-haproxy-cfg]
filename = haproxy.cfg.in
......
......@@ -313,7 +313,7 @@ apachedex = ${monitor-directory:private}/apachedex
[{{ section('resiliency-exclude-file') }}]
# Generate rdiff exclude file in case of resiliency
< = jinja2-template-base
template = {{ 'inline:{{ "${directory:log}\\n" }}' }}
template = {{ 'inline:{{ "${directory:log}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[{{ section('monitor-generate-apachedex-report') }}]
......
......@@ -273,7 +273,7 @@ slowquery = ${monitor-directory:private}/slowquery_digest
[{{ section('resiliency-exclude-file') }}]
# Generate rdiff exclude file in case of resiliency
< = jinja2-template-base
template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n${directory:log}\\n" }}' }}
template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n${directory:log}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-identity-signature-script")}}]
......
......@@ -62,7 +62,7 @@ var-spool-postfix-trace = ${:var-spool-postfix}/trace
# Generate rdiff exclude file
recipe = slapos.recipe.template:jinja2
mode = 644
template = {{ 'inline:{{ "${directory:log}\\n" }}' }}
template = {{ 'inline:{{ "${directory:log}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
{% if divert -%}
......
......@@ -109,7 +109,7 @@ command = ${tidstorage:repozo-wrapper}
# Generate rdiff exclude file
recipe = slapos.recipe.template:jinja2
mode = 644
template = {{ 'inline:{{ "${directory:zodb}/**\\n${directory:log}\\n" }}' }}
template = {{ 'inline:{{ "${directory:zodb}/**\\n${directory:log}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-identity-signature-script")}}]
......
......@@ -115,7 +115,7 @@ ca-crl = ${:ca-dir}/crl
# Generate rdiff exclude file
recipe = slapos.recipe.template:jinja2
mode = 644
template = {{ 'inline:{{ "${directory:log}\\n" }}' }}
template = {{ 'inline:{{ "${directory:log}/**\\n" }}' }}
rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-identity-signature-script")}}]
......
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