From 61e3fdee9ae56be413edba4f455f2d7e9d5a50cc Mon Sep 17 00:00:00 2001
From: Grant Slater <github@firefishy.com>
Date: Wed, 22 Oct 2025 06:55:57 +0300
Subject: [PATCH] Fix tar backup failures

---
 cookbooks/blog/templates/default/backup-staging.cron.erb   | 7 ++++++-
 cookbooks/blog/templates/default/backup.cron.erb           | 7 ++++++-
 cookbooks/mailman/templates/default/backup.cron.erb        | 1 +
 .../mediawiki/templates/default/mediawiki-backup.cron.erb  | 5 ++++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/cookbooks/blog/templates/default/backup-staging.cron.erb b/cookbooks/blog/templates/default/backup-staging.cron.erb
index 1aa47cb97..65e638e21 100644
--- a/cookbooks/blog/templates/default/backup-staging.cron.erb
+++ b/cookbooks/blog/templates/default/backup-staging.cron.erb
@@ -17,7 +17,12 @@ 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"
 
-nice tar --create --dereference --directory="$T" --sort=name --warning=no-file-changed "osm-blog-staging-$D" | nice zstd --quiet --long --rsyncable -o "$T/$B"
+nice tar --create --dereference --directory="$T" \
+  --sort=name \
+  --warning=no-file-changed \
+  --warning=no-file-removed \
+  --ignore-failed-read \
+  "osm-blog-staging-$D" | nice zstd --quiet --long --rsyncable -o "$T/$B"
 nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup
 
 rm -rf "$T"
diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index 2f940ef7c..72f884d08 100644
--- a/cookbooks/blog/templates/default/backup.cron.erb
+++ b/cookbooks/blog/templates/default/backup.cron.erb
@@ -17,7 +17,12 @@ 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"
 
-nice tar --create --dereference --directory="$T" --sort=name --warning=no-file-changed "osm-blog-$D" | nice zstd --quiet --long --rsyncable -o "$T/$B"
+nice tar --create --dereference --directory="$T" \
+  --sort=name \
+  --warning=no-file-changed \
+  --warning=no-file-removed \
+  --ignore-failed-read \
+  "osm-blog-$D" | nice zstd --quiet --long --rsyncable -o "$T/$B"
 nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup
 
 rm -rf "$T"
diff --git a/cookbooks/mailman/templates/default/backup.cron.erb b/cookbooks/mailman/templates/default/backup.cron.erb
index a1ccaf30a..0cae0a660 100644
--- a/cookbooks/mailman/templates/default/backup.cron.erb
+++ b/cookbooks/mailman/templates/default/backup.cron.erb
@@ -16,6 +16,7 @@ ln -s /var/lib/mailman "$T/lists-$D/mailman"
 nice tar --create --dereference \
     --warning=no-file-changed \
     --warning=no-file-removed \
+    --ignore-failed-read \
     --exclude='*/archives/*.txt.gz' \
     --directory="$T" \
     --sort=name \
diff --git a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb
index 7abacd6d4..59899b9d2 100755
--- a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb
+++ b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb
@@ -17,7 +17,10 @@ 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"
 
-nice tar --create --dereference --directory="$T" --warning=no-file-changed --warning=no-file-removed \
+nice tar --create --dereference --directory="$T" \
+  --warning=no-file-changed \
+  --warning=no-file-removed \
+  --ignore-failed-read \
   --exclude="wiki-<%= @name %>-$D/www/w/images/thumb" \
   --exclude="wiki-<%= @name %>-$D/www/w/.git" \
   --exclude="wiki-<%= @name %>-$D/www/w/extensions/*/.git" \
-- 
2.39.5