From eed833d266f3832f28bf800576843913e7e86a18 Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Wed, 22 Oct 2025 07:32:30 +0300
Subject: [PATCH] Tar backup still returns error, ignore for now

---
 cookbooks/blog/templates/default/backup-staging.cron.erb        | 1 +
 cookbooks/blog/templates/default/backup.cron.erb                | 1 +
 cookbooks/community/templates/default/backup.cron.erb           | 1 +
 cookbooks/mailman/templates/default/backup.cron.erb             | 1 +
 cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb | 1 +
 5 files changed, 5 insertions(+)

diff --git a/cookbooks/blog/templates/default/backup-staging.cron.erb b/cookbooks/blog/templates/default/backup-staging.cron.erb
index 65e638e21..ff464e9c1 100644
--- a/cookbooks/blog/templates/default/backup-staging.cron.erb
+++ b/cookbooks/blog/templates/default/backup-staging.cron.erb
@@ -17,6 +17,7 @@ echo 'password=<%= @passwords["osm-blog-staging-user"] %>' >> "$T/mysqldump.opts
 mysqldump --defaults-file="$T/mysqldump.opts" --opt --no-tablespaces --max-allowed-packet=1G osm-blog-staging > "$T/osm-blog-staging-$D/osm-blog-staging.sql"
 ln -s /srv/staging.blog.openstreetmap.org "$T/osm-blog-staging-$D/www"
 
+set +e
 nice tar --create --dereference --directory="$T" \
   --sort=name \
   --warning=no-file-changed \
diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index 72f884d08..c14286617 100644
--- a/cookbooks/blog/templates/default/backup.cron.erb
+++ b/cookbooks/blog/templates/default/backup.cron.erb
@@ -17,6 +17,7 @@ echo 'password=<%= @passwords["osm-blog-user"] %>' >> "$T/mysqldump.opts"
 mysqldump --defaults-file="$T/mysqldump.opts" --opt --no-tablespaces --max-allowed-packet=1G osm-blog > "$T/osm-blog-$D/osm-blog.sql"
 ln -s /srv/blog.openstreetmap.org "$T/osm-blog-$D/www"
 
+set +e
 nice tar --create --dereference --directory="$T" \
   --sort=name \
   --warning=no-file-changed \
diff --git a/cookbooks/community/templates/default/backup.cron.erb b/cookbooks/community/templates/default/backup.cron.erb
index 4080caebe..e5932b744 100644
--- a/cookbooks/community/templates/default/backup.cron.erb
+++ b/cookbooks/community/templates/default/backup.cron.erb
@@ -16,6 +16,7 @@ ln -s /srv/community.openstreetmap.org/shared/web-only "$T/community-$D/shared-w
 ln -s /srv/community.openstreetmap.org/shared/data/redis_data "$T/community-$D/shared-data-redis_data"
 ln -s /srv/community.openstreetmap.org/shared/data/postgres_backup "$T/community-$D/shared-data-postgres_backup"
 
+set +e
 nice tar --create --numeric-owner --dereference --directory="$T" \
   --sort=name \
   --warning=no-file-changed \
diff --git a/cookbooks/mailman/templates/default/backup.cron.erb b/cookbooks/mailman/templates/default/backup.cron.erb
index 0cae0a660..33cd61132 100644
--- a/cookbooks/mailman/templates/default/backup.cron.erb
+++ b/cookbooks/mailman/templates/default/backup.cron.erb
@@ -13,6 +13,7 @@ B="lists-$D.tar.zst"
 mkdir "$T/lists-$D"
 ln -s /var/lib/mailman "$T/lists-$D/mailman"
 
+set +e
 nice tar --create --dereference \
     --warning=no-file-changed \
     --warning=no-file-removed \
diff --git a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb
index 59899b9d2..1287fbaed 100755
--- a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb
+++ b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb
@@ -17,6 +17,7 @@ echo 'password=<%= @database_params[:password] %>' >> "$T/mysqldump.opts"
 mysqldump --defaults-file="$T/mysqldump.opts" --opt --skip-lock-tables --single-transaction --no-tablespaces --max-allowed-packet=1G "<%= @database_params[:name] %>" | zstd --quiet --long --rsyncable -o "$T/wiki-<%= @name %>-$D/wiki.sql.zst"
 ln -s "<%= @directory %>" "$T/wiki-<%= @name %>-$D/www"
 
+set +e
 nice tar --create --dereference --directory="$T" \
   --warning=no-file-changed \
   --warning=no-file-removed \
-- 
2.39.5