Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joanne Hugé
slapos
Commits
6ac8bccd
Commit
6ac8bccd
authored
Nov 09, 2018
by
Nicolas Wavrant
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5: exclude log folders from resilient backups
parent
b0ac8456
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
43 additions
and
8 deletions
+43
-8
stack/caucase/buildout.hash.cfg
stack/caucase/buildout.hash.cfg
+1
-1
stack/caucase/instance-caucase.cfg.jinja2.in
stack/caucase/instance-caucase.cfg.jinja2.in
+11
-0
stack/erp5/buildout.hash.cfg
stack/erp5/buildout.hash.cfg
+5
-5
stack/erp5/instance-balancer.cfg.in
stack/erp5/instance-balancer.cfg.in
+6
-0
stack/erp5/instance-mariadb.cfg.in
stack/erp5/instance-mariadb.cfg.in
+1
-1
stack/erp5/instance-postfix.cfg.in
stack/erp5/instance-postfix.cfg.in
+9
-0
stack/erp5/instance-zeo.cfg.in
stack/erp5/instance-zeo.cfg.in
+1
-1
stack/erp5/instance-zope.cfg.in
stack/erp5/instance-zope.cfg.in
+9
-0
No files found.
stack/caucase/buildout.hash.cfg
View file @
6ac8bccd
...
@@ -27,7 +27,7 @@ md5sum = c005cfef03a0c2e504fcfa075e59934a
...
@@ -27,7 +27,7 @@ md5sum = c005cfef03a0c2e504fcfa075e59934a
[template-caucase]
[template-caucase]
filename = instance-caucase.cfg.jinja2.in
filename = instance-caucase.cfg.jinja2.in
md5sum =
bab4cf56121f964eaad1abfba695d30
7
md5sum =
799f8c8cc26188fae85afa0577a2d54
7
[instance-caucase]
[instance-caucase]
filename = instance.cfg.in
filename = instance.cfg.in
...
...
stack/caucase/instance-caucase.cfg.jinja2.in
View file @
6ac8bccd
...
@@ -222,6 +222,17 @@ init-user = admin
...
@@ -222,6 +222,17 @@ init-user = admin
{% do part_list.append('publish-connection-parameter') -%}
{% do part_list.append('publish-connection-parameter') -%}
{% endif -%}
{% 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]
[buildout]
extends =
extends =
...
...
stack/erp5/buildout.hash.cfg
View file @
6ac8bccd
...
@@ -26,7 +26,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
...
@@ -26,7 +26,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
[template-mariadb]
[template-mariadb]
filename = instance-mariadb.cfg.in
filename = instance-mariadb.cfg.in
md5sum =
f59c9c313147e437637c2c5ef00438d0
md5sum =
6aac38ecaae4e31410c3a514773eabc7
[template-kumofs]
[template-kumofs]
filename = instance-kumofs.cfg.in
filename = instance-kumofs.cfg.in
...
@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
...
@@ -50,7 +50,7 @@ md5sum = dec33a617fa1b307c8ddb883efcfe3ce
[template-postfix]
[template-postfix]
filename = instance-postfix.cfg.in
filename = instance-postfix.cfg.in
md5sum =
0d4938bc36c3829646d6f93fced9a3e0
md5sum =
9f504c280df638520ed416cbc3a93f41
[template-postfix-master-cf]
[template-postfix-master-cf]
filename = postfix_master.cf.in
filename = postfix_master.cf.in
...
@@ -78,15 +78,15 @@ md5sum = 83e69244728a0d323f535dd3e8b734b6
...
@@ -78,15 +78,15 @@ md5sum = 83e69244728a0d323f535dd3e8b734b6
[template-zeo]
[template-zeo]
filename = instance-zeo.cfg.in
filename = instance-zeo.cfg.in
md5sum =
d8f70f5826315a402bf6d72744b80bd9
md5sum =
47b2759adcdf784359d2e015ef3fae55
[template-zope]
[template-zope]
filename = instance-zope.cfg.in
filename = instance-zope.cfg.in
md5sum =
d1257e7e942307be0a79e34aa4320e9f
md5sum =
93e05a68ee9c97dc23294c334c7670f9
[template-balancer]
[template-balancer]
filename = instance-balancer.cfg.in
filename = instance-balancer.cfg.in
md5sum =
f0fd49c7d6d9f7c6936afba0d18b7691
md5sum =
461b39677d47b3410a4ca0e396110b96
[template-haproxy-cfg]
[template-haproxy-cfg]
filename = haproxy.cfg.in
filename = haproxy.cfg.in
...
...
stack/erp5/instance-balancer.cfg.in
View file @
6ac8bccd
...
@@ -310,6 +310,12 @@ newcerts = ${:ca-dir}/newcerts
...
@@ -310,6 +310,12 @@ newcerts = ${:ca-dir}/newcerts
crl = ${:ca-dir}/crl
crl = ${:ca-dir}/crl
apachedex = ${monitor-directory:private}/apachedex
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') }}]
[{{ section('monitor-generate-apachedex-report') }}]
recipe = slapos.cookbook:cron.d
recipe = slapos.cookbook:cron.d
cron-entries = ${cron:cron-entries}
cron-entries = ${cron:cron-entries}
...
...
stack/erp5/instance-mariadb.cfg.in
View file @
6ac8bccd
...
@@ -273,7 +273,7 @@ slowquery = ${monitor-directory:private}/slowquery_digest
...
@@ -273,7 +273,7 @@ slowquery = ${monitor-directory:private}/slowquery_digest
[{{ section('resiliency-exclude-file') }}]
[{{ section('resiliency-exclude-file') }}]
# Generate rdiff exclude file in case of resiliency
# Generate rdiff exclude file in case of resiliency
< = jinja2-template-base
< = jinja2-template-base
template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n" }}' }}
template = {{ 'inline:{{ "${directory:mariadb-data}/**\\n
${directory:log}\\n
" }}' }}
rendered = ${directory:srv}/exporter.exclude
rendered = ${directory:srv}/exporter.exclude
[dash]
[dash]
...
...
stack/erp5/instance-postfix.cfg.in
View file @
6ac8bccd
...
@@ -56,6 +56,15 @@ var-spool-postfix-public = ${:var-spool-postfix}/public
...
@@ -56,6 +56,15 @@ var-spool-postfix-public = ${:var-spool-postfix}/public
var-spool-postfix-saved = ${:var-spool-postfix}/saved
var-spool-postfix-saved = ${:var-spool-postfix}/saved
var-spool-postfix-trace = ${:var-spool-postfix}/trace
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 -%}
{% if divert -%}
{% set milter_port = tcpv4_port + 1 -%}
{% set milter_port = tcpv4_port + 1 -%}
{% set socket = 'inet:' ~ ip ~ ':' ~ milter_port -%}
{% set socket = 'inet:' ~ ip ~ ':' ~ milter_port -%}
...
...
stack/erp5/instance-zeo.cfg.in
View file @
6ac8bccd
...
@@ -109,7 +109,7 @@ command = ${tidstorage:repozo-wrapper}
...
@@ -109,7 +109,7 @@ command = ${tidstorage:repozo-wrapper}
# Generate rdiff exclude file
# Generate rdiff exclude file
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
mode = 644
mode = 644
template = {{ 'inline:{{ "${directory:zodb}/**\\n" }}' }}
template = {{ 'inline:{{ "${directory:zodb}/**\\n
${directory:log}\\n
" }}' }}
rendered = ${directory:srv}/exporter.exclude
rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-after-import-script") }}]
[{{ section("resiliency-after-import-script") }}]
...
...
stack/erp5/instance-zope.cfg.in
View file @
6ac8bccd
...
@@ -109,6 +109,15 @@ ca-certs = ${:ca-dir}/certs
...
@@ -109,6 +109,15 @@ ca-certs = ${:ca-dir}/certs
ca-newcerts = ${:ca-dir}/newcerts
ca-newcerts = ${:ca-dir}/newcerts
ca-crl = ${:ca-dir}/crl
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]
[binary-link]
recipe = slapos.cookbook:symbolic.link
recipe = slapos.cookbook:symbolic.link
target-directory = ${directory:bin}
target-directory = ${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