erp5: exclude log folders from resilient backups

stack/caucase/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = c005cfef03a0c2e504fcfa075e59934a
 
 [template-caucase]
 filename = instance-caucase.cfg.jinja2.in
-md5sum = bab4cf56121f964eaad1abfba695d307
+md5sum = 799f8c8cc26188fae85afa0577a2d547
 
 [instance-caucase]
 filename = instance.cfg.in

stack/caucase/instance-caucase.cfg.jinja2.in

@@ -222,6 +222,17 @@ init-user = admin
 {% do part_list.append('publish-connection-parameter') -%}
 {% endif -%}
 
+# Used for ERP5 resiliency or (more probably)
+# webrunner resiliency with erp5 inside.
+[resiliency-exclude-file]
+# Generate rdiff exclude file
+recipe = slapos.recipe.template:jinja2
+mode = 644
+template = inline:
+  ${directory:log}
+rendered = ${directory:srv}/exporter.exclude
+{% do part_list.append('resiliency-exclude-file') -%}
+
 [buildout]
 
 extends =

stack/erp5/buildout.hash.cfg

@@ -26,7 +26,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = f59c9c313147e437637c2c5ef00438d0
+md5sum = 6aac38ecaae4e31410c3a514773eabc7
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
 
 [template-postfix]
 filename = instance-postfix.cfg.in
-md5sum = 0d4938bc36c3829646d6f93fced9a3e0
+md5sum = 9f504c280df638520ed416cbc3a93f41
 
 [template-postfix-master-cf]
 filename = postfix_master.cf.in
@@ -78,15 +78,15 @@ md5sum = 83e69244728a0d323f535dd3e8b734b6
 
 [template-zeo]
 filename = instance-zeo.cfg.in
-md5sum = d8f70f5826315a402bf6d72744b80bd9
+md5sum = 47b2759adcdf784359d2e015ef3fae55
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = d1257e7e942307be0a79e34aa4320e9f
+md5sum = 93e05a68ee9c97dc23294c334c7670f9
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = f0fd49c7d6d9f7c6936afba0d18b7691
+md5sum = 461b39677d47b3410a4ca0e396110b96
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -310,6 +310,12 @@ newcerts = ${:ca-dir}/newcerts
 crl = ${:ca-dir}/crl
 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" }}' }}
+rendered = ${directory:srv}/exporter.exclude
+
 [{{ section('monitor-generate-apachedex-report') }}]
 recipe = slapos.cookbook:cron.d
 cron-entries = ${cron:cron-entries}

stack/erp5/instance-mariadb.cfg.in

@@ -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" }}' }}
+template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n${directory:log}\\n" }}' }}
 rendered = ${directory:srv}/exporter.exclude
 
 [dash]

stack/erp5/instance-postfix.cfg.in

@@ -56,6 +56,15 @@ var-spool-postfix-public = ${:var-spool-postfix}/public
 var-spool-postfix-saved = ${:var-spool-postfix}/saved
 var-spool-postfix-trace = ${:var-spool-postfix}/trace
 
+# Used for ERP5 resiliency or (more probably)
+# webrunner resiliency with erp5 inside.
+[{{ section("resiliency-exclude-file") }}]
+# Generate rdiff exclude file
+recipe = slapos.recipe.template:jinja2
+mode = 644
+template = {{ 'inline:{{ "${directory:log}\\n" }}' }}
+rendered = ${directory:srv}/exporter.exclude
+
 {% if divert -%}
 {%   set milter_port = tcpv4_port + 1 -%}
 {%   set socket = 'inet:' ~ ip ~ ':' ~ milter_port -%}

stack/erp5/instance-zeo.cfg.in

@@ -109,7 +109,7 @@ command = ${tidstorage:repozo-wrapper}
 # Generate rdiff exclude file
 recipe = slapos.recipe.template:jinja2
 mode = 644
-template = {{ 'inline:{{ "${directory:zodb}/**\\n" }}' }}
+template = {{ 'inline:{{ "${directory:zodb}/**\\n${directory:log}\\n" }}' }}
 rendered = ${directory:srv}/exporter.exclude
 
 [{{ section("resiliency-after-import-script") }}]

stack/erp5/instance-zope.cfg.in

@@ -109,6 +109,15 @@ ca-certs = ${:ca-dir}/certs
 ca-newcerts = ${:ca-dir}/newcerts
 ca-crl = ${:ca-dir}/crl
 
+# Used for ERP5 resiliency or (more probably)
+# webrunner resiliency with erp5 inside.
+[{{ section("resiliency-exclude-file") }}]
+# Generate rdiff exclude file
+recipe = slapos.recipe.template:jinja2
+mode = 644
+template = {{ 'inline:{{ "${directory:log}\\n" }}' }}
+rendered = ${directory:srv}/exporter.exclude
+
 [binary-link]
 recipe = slapos.cookbook:symbolic.link
 target-directory = ${directory:bin}