Commit 03fa053a authored by Nicolas Wavrant's avatar Nicolas Wavrant

erp5: do not exclude full directory from signature calculation

for mariadb, zeo and zope instances. Instead use the latest feature
of the signature script to exclude the correct files
parent d3ad93f5
...@@ -26,7 +26,7 @@ md5sum = e405227118a70fbf949a6414469989db ...@@ -26,7 +26,7 @@ md5sum = e405227118a70fbf949a6414469989db
[template-mariadb] [template-mariadb]
filename = instance-mariadb.cfg.in filename = instance-mariadb.cfg.in
md5sum = fc814dc35ee1a970d5f092cc0bb3a7a7 md5sum = b27b034e7c9ab13e446e4ac59cda9f38
[template-kumofs] [template-kumofs]
filename = instance-kumofs.cfg.in filename = instance-kumofs.cfg.in
...@@ -78,11 +78,11 @@ md5sum = eefce8adf37430b63559299699732b31 ...@@ -78,11 +78,11 @@ md5sum = eefce8adf37430b63559299699732b31
[template-zeo] [template-zeo]
filename = instance-zeo.cfg.in filename = instance-zeo.cfg.in
md5sum = f9151066df96527d4c7f75c3079b2c10 md5sum = d400c3d449ce437a0ded77ee3d5c5df2
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = ac26b478d353ce76cdad137e04e34217 md5sum = 36f72fcff7b2ebed8343f4ec3f3568f8
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -278,10 +278,8 @@ rendered = ${directory:srv}/exporter.exclude ...@@ -278,10 +278,8 @@ rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-identity-signature-script")}}] [{{ section("resiliency-identity-signature-script")}}]
# Generate identity script used by webrunner to check data integrity # Generate identity script used by webrunner to check data integrity
# It excludes repozo files as they already include a hash function
# used to check backups when rebuilding the datafs
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/backup-identity-script-excluding-path --exclude-path "srv/backup/logrotate" command-line = {{ bin_directory }}/backup-identity-script-excluding-path --exclude-path "srv/backup/logrotate/**"
wrapper-path = ${directory:srv}/.backup_identity_script wrapper-path = ${directory:srv}/.backup_identity_script
mode = 770 mode = 770
......
...@@ -117,7 +117,7 @@ rendered = ${directory:srv}/exporter.exclude ...@@ -117,7 +117,7 @@ rendered = ${directory:srv}/exporter.exclude
# It excludes repozo files as they already include a hash function # It excludes repozo files as they already include a hash function
# used to check backups when rebuilding the datafs # used to check backups when rebuilding the datafs
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/backup-identity-script-excluding-path --exclude-path "srv/backup/logrotate" --exclude-path "srv/backup/zodb" command-line = {{ bin_directory }}/backup-identity-script-excluding-path --exclude-path "srv/backup/logrotate/**" --exclude-path "srv/backup/zodb/*/*fsz"
wrapper-path = ${directory:srv}/.backup_identity_script wrapper-path = ${directory:srv}/.backup_identity_script
mode = 770 mode = 770
......
...@@ -120,10 +120,8 @@ rendered = ${directory:srv}/exporter.exclude ...@@ -120,10 +120,8 @@ rendered = ${directory:srv}/exporter.exclude
[{{ section("resiliency-identity-signature-script")}}] [{{ section("resiliency-identity-signature-script")}}]
# Generate identity script used by webrunner to check data integrity # Generate identity script used by webrunner to check data integrity
# It excludes repozo files as they already include a hash function
# used to check backups when rebuilding the datafs
recipe = slapos.cookbook:wrapper recipe = slapos.cookbook:wrapper
command-line = {{ bin_directory }}/backup-identity-script-excluding-path --exclude-path "srv/backup/logrotate" command-line = {{ bin_directory }}/backup-identity-script-excluding-path --exclude-path "srv/backup/logrotate/**"
wrapper-path = ${directory:srv}/.backup_identity_script wrapper-path = ${directory:srv}/.backup_identity_script
mode = 770 mode = 770
......
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