diff --git a/stack/caucase/buildout.hash.cfg b/stack/caucase/buildout.hash.cfg index 6b016c6413e0c39fc86c3699e1be4fd367b26fe9..ab512e0a8396f0b098cf83d9d3ea6ea1a3d12bf5 100644 --- a/stack/caucase/buildout.hash.cfg +++ b/stack/caucase/buildout.hash.cfg @@ -27,7 +27,7 @@ md5sum = c005cfef03a0c2e504fcfa075e59934a [template-caucase] filename = instance-caucase.cfg.jinja2.in -md5sum = 799f8c8cc26188fae85afa0577a2d547 +md5sum = 589a0ad37abc28cf6e34e406e7b83eec [instance-caucase] filename = instance.cfg.in diff --git a/stack/caucase/instance-caucase.cfg.jinja2.in b/stack/caucase/instance-caucase.cfg.jinja2.in index 68cd80ebe4e4306256c0853e81d168208760aed7..6ca981b141240c04e27428c2c773af96fc85ee73 100644 --- a/stack/caucase/instance-caucase.cfg.jinja2.in +++ b/stack/caucase/instance-caucase.cfg.jinja2.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') -%} diff --git a/stack/erp5/buildout.hash.cfg b/stack/erp5/buildout.hash.cfg index 5d182664c6b8bf70ab5770e70da4e4a216f44cba..2599f49e78704ca4f5b6e8645d9c87d2d03e3018 100644 --- a/stack/erp5/buildout.hash.cfg +++ b/stack/erp5/buildout.hash.cfg @@ -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 diff --git a/stack/erp5/instance-balancer.cfg.in b/stack/erp5/instance-balancer.cfg.in index ecd104473496e8459d459671b0f1b24cdb280ada..e7adfe61c3620f538e7b29d1336876bcddad4c58 100644 --- a/stack/erp5/instance-balancer.cfg.in +++ b/stack/erp5/instance-balancer.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') }}] diff --git a/stack/erp5/instance-mariadb.cfg.in b/stack/erp5/instance-mariadb.cfg.in index d6a5d980ecaaa0bedaff337191f5f6f033d39b93..8c49c578a2202d9277349dadcdf6e543fd9b20de 100644 --- a/stack/erp5/instance-mariadb.cfg.in +++ b/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${directory:log}\\n" }}' }} +template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n${directory:log}/**\\n" }}' }} rendered = ${directory:srv}/exporter.exclude [{{ section("resiliency-identity-signature-script")}}] diff --git a/stack/erp5/instance-postfix.cfg.in b/stack/erp5/instance-postfix.cfg.in index 9737dc55669260e3c31fec6c315597146cec6edf..87d5243742eeda90cf84549ccbd38bf36d9f3e25 100644 --- a/stack/erp5/instance-postfix.cfg.in +++ b/stack/erp5/instance-postfix.cfg.in @@ -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 -%} diff --git a/stack/erp5/instance-zeo.cfg.in b/stack/erp5/instance-zeo.cfg.in index 13f5bed449420024fed2dccebb85ad27b659268f..8c200e4f9e0781676d9bf7dd4e426e1e35e2b102 100644 --- a/stack/erp5/instance-zeo.cfg.in +++ b/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${directory:log}\\n" }}' }} +template = {{ 'inline:{{ "${directory:zodb}/**\\n${directory:log}/**\\n" }}' }} rendered = ${directory:srv}/exporter.exclude [{{ section("resiliency-identity-signature-script")}}] diff --git a/stack/erp5/instance-zope.cfg.in b/stack/erp5/instance-zope.cfg.in index 99a216211e3111d4521e06396b9982fdd0bc41e8..94c60424ab805fab32b768d32a2727a23617d714 100644 --- a/stack/erp5/instance-zope.cfg.in +++ b/stack/erp5/instance-zope.cfg.in @@ -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")}}]