From cb66d7ddced5d6b53c4ff280b58986d442cf2d2f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 6 Jun 2025 09:01:30 +0100 Subject: [PATCH] Add --quiet to zstd invocations --- cookbooks/blog/templates/default/backup-staging.cron.erb | 2 +- cookbooks/blog/templates/default/backup.cron.erb | 2 +- cookbooks/blogs/templates/default/backup.cron.erb | 2 +- cookbooks/chef/templates/default/server-backup.cron.erb | 2 +- cookbooks/civicrm/templates/default/backup.cron.erb | 2 +- cookbooks/community/templates/default/backup.cron.erb | 2 +- cookbooks/git/templates/default/backup.cron.erb | 2 +- cookbooks/mailman/templates/default/backup.cron.erb | 2 +- .../mediawiki/templates/default/mediawiki-backup.cron.erb | 4 ++-- cookbooks/osqa/templates/default/backup.cron.erb | 2 +- cookbooks/otrs/templates/default/backup.cron.erb | 2 +- cookbooks/prometheus/templates/default/backup.cron.erb | 2 +- cookbooks/stateofthemap/templates/default/backup.cron.erb | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cookbooks/blog/templates/default/backup-staging.cron.erb b/cookbooks/blog/templates/default/backup-staging.cron.erb index 6e6f99dab..eaabf3582 100644 --- a/cookbooks/blog/templates/default/backup-staging.cron.erb +++ b/cookbooks/blog/templates/default/backup-staging.cron.erb @@ -16,7 +16,7 @@ echo 'password=<%= @passwords["osm-blog-staging-user"] %>' >> "$T/mysqldump.opts mysqldump --defaults-file="$T/mysqldump.opts" --opt --no-tablespaces 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" --warning=no-file-changed "osm-blog-staging-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" --warning=no-file-changed "osm-blog-staging-$D" | nice zstd --quiet --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 a36bbe48b..a71169eba 100644 --- a/cookbooks/blog/templates/default/backup.cron.erb +++ b/cookbooks/blog/templates/default/backup.cron.erb @@ -16,7 +16,7 @@ echo 'password=<%= @passwords["osm-blog-user"] %>' >> "$T/mysqldump.opts" mysqldump --defaults-file="$T/mysqldump.opts" --opt --no-tablespaces 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" --warning=no-file-changed "osm-blog-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" --warning=no-file-changed "osm-blog-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/blogs/templates/default/backup.cron.erb b/cookbooks/blogs/templates/default/backup.cron.erb index 36725ef6b..1397b9b26 100644 --- a/cookbooks/blogs/templates/default/backup.cron.erb +++ b/cookbooks/blogs/templates/default/backup.cron.erb @@ -12,7 +12,7 @@ B="blogs-$D.tar.zst" mkdir "$T/blogs-$D" sqlite3 /srv/blogs.openstreetmap.org/planet.db ".backup $T/blogs-$D/planet.db" -nice tar --create --dereference --directory="$T" "blogs-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "blogs-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/chef/templates/default/server-backup.cron.erb b/cookbooks/chef/templates/default/server-backup.cron.erb index 601432069..82b9f4854 100644 --- a/cookbooks/chef/templates/default/server-backup.cron.erb +++ b/cookbooks/chef/templates/default/server-backup.cron.erb @@ -15,7 +15,7 @@ chmod g+rwx "$T" "$T/chef-server-$D" sudo -u opscode-pgsql /opt/opscode/embedded/bin/pg_dumpall --file="$T/chef-server-$D/chef.dmp" --clean ln -s /var/opt/opscode/bookshelf/data "$T/chef-server-$D/bookshelf" -nice tar --create --dereference --directory="$T" "chef-server-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "chef-server-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/civicrm/templates/default/backup.cron.erb b/cookbooks/civicrm/templates/default/backup.cron.erb index 373090103..a071e9b99 100644 --- a/cookbooks/civicrm/templates/default/backup.cron.erb +++ b/cookbooks/civicrm/templates/default/backup.cron.erb @@ -16,7 +16,7 @@ echo 'password=<%= @passwords["database"] %>' >> "$T/mysqldump.opts" mysqldump --defaults-file="$T/mysqldump.opts" --opt --skip-lock-tables --no-tablespaces civicrm > "$T/osmf-crm-$D/civicrm.sql" ln -s /srv/supporting.openstreetmap.org "$T/osmf-crm-$D/www" -nice tar --create --dereference --directory="$T" "osmf-crm-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "osmf-crm-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/community/templates/default/backup.cron.erb b/cookbooks/community/templates/default/backup.cron.erb index e3af3df63..5a7285d74 100644 --- a/cookbooks/community/templates/default/backup.cron.erb +++ b/cookbooks/community/templates/default/backup.cron.erb @@ -15,7 +15,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" -nice tar --create --numeric-owner --dereference --directory="$T" --warning=no-file-changed "community-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --numeric-owner --dereference --directory="$T" --warning=no-file-changed "community-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/git/templates/default/backup.cron.erb b/cookbooks/git/templates/default/backup.cron.erb index 02fe522e3..419b0faed 100644 --- a/cookbooks/git/templates/default/backup.cron.erb +++ b/cookbooks/git/templates/default/backup.cron.erb @@ -11,7 +11,7 @@ B="git-$D.tar.zst" ln -s /var/lib/git "$T/git-$D" -nice tar --create --dereference --directory="$T" "git-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "git-$D" | nice zstd --quiet --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 13423f1f8..bf6df6530 100644 --- a/cookbooks/mailman/templates/default/backup.cron.erb +++ b/cookbooks/mailman/templates/default/backup.cron.erb @@ -12,7 +12,7 @@ B="lists-$D.tar.zst" mkdir "$T/lists-$D" ln -s /var/lib/mailman "$T/lists-$D/mailman" -nice tar --create --dereference --warning=no-file-changed --warning=no-file-removed --directory="$T" "lists-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --warning=no-file-changed --warning=no-file-removed --directory="$T" "lists-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb index 6c1913d26..82eaff96d 100755 --- a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb +++ b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb @@ -13,7 +13,7 @@ mkdir "$T/wiki-<%= @name %>-$D" echo '[mysqldump]' > "$T/mysqldump.opts" echo 'user=<%= @database_params[:username] %>' >> "$T/mysqldump.opts" echo 'password=<%= @database_params[:password] %>' >> "$T/mysqldump.opts" -mysqldump --defaults-file="$T/mysqldump.opts" --opt --skip-lock-tables --single-transaction --no-tablespaces "<%= @database_params[:name] %>" | zstd --rsyncable -o "$T/wiki-<%= @name %>-$D/wiki.sql.zst" +mysqldump --defaults-file="$T/mysqldump.opts" --opt --skip-lock-tables --single-transaction --no-tablespaces "<%= @database_params[:name] %>" | zstd --quiet --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 \ @@ -21,7 +21,7 @@ nice tar --create --dereference --directory="$T" --warning=no-file-changed --war --exclude="wiki-<%= @name %>-$D/www/w/.git" \ --exclude="wiki-<%= @name %>-$D/www/w/extensions/*/.git" \ --exclude="wiki-<%= @name %>-$D/www/dump" \ - "wiki-<%= @name %>-$D" | nice zstd --rsyncable -o "$T/$B" + "wiki-<%= @name %>-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/osqa/templates/default/backup.cron.erb b/cookbooks/osqa/templates/default/backup.cron.erb index 0c89a5e43..0307d6fe8 100644 --- a/cookbooks/osqa/templates/default/backup.cron.erb +++ b/cookbooks/osqa/templates/default/backup.cron.erb @@ -15,7 +15,7 @@ chown "<%= @user %>" "$T/osqa-$D" sudo -u "<%= @user %>" pg_dump --format=custom --file="$T/<%= @name %>-$D/osqa.dmp" "<%= @database %>" ln -s "<%= @directory %>/upfiles" "$T/<%= @name %>-$D/upfiles" -nice tar --create --dereference --directory="$T" "<%= @name %>-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "<%= @name %>-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/otrs/templates/default/backup.cron.erb b/cookbooks/otrs/templates/default/backup.cron.erb index 6fdb74b40..bc12848fa 100644 --- a/cookbooks/otrs/templates/default/backup.cron.erb +++ b/cookbooks/otrs/templates/default/backup.cron.erb @@ -16,7 +16,7 @@ sudo -u otrs pg_dump --file="$T/otrs-$D/otrs.dmp" otrs ln -s /var/lib/otrs "$T/otrs-$D/otrs-var" ln -s /etc/apache2/sites-available/otrs.openstreetmap.org.conf "$T/otrs-$D/apache2-otrs.openstreetmap.org.conf" -nice tar --create --dereference --directory="$T" "otrs-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "otrs-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/prometheus/templates/default/backup.cron.erb b/cookbooks/prometheus/templates/default/backup.cron.erb index 3760820b9..93da842a1 100644 --- a/cookbooks/prometheus/templates/default/backup.cron.erb +++ b/cookbooks/prometheus/templates/default/backup.cron.erb @@ -14,7 +14,7 @@ mkdir "$T/prometheus-$D" ln -s /var/lib/prometheus/alertmanager "$T/prometheus-$D/alertmanager" ln -s /var/lib/grafana "$T/prometheus-$D/grafana" -nice tar --create --dereference --directory="$T" "prometheus-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "prometheus-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" diff --git a/cookbooks/stateofthemap/templates/default/backup.cron.erb b/cookbooks/stateofthemap/templates/default/backup.cron.erb index e35e4017c..055e810d6 100644 --- a/cookbooks/stateofthemap/templates/default/backup.cron.erb +++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb @@ -22,7 +22,7 @@ ln -s /srv/2010.stateofthemap.org "$T/sotm-$D/www2010" ln -s /srv/2011.stateofthemap.org "$T/sotm-$D/www2011" ln -s /srv/2012.stateofthemap.org "$T/sotm-$D/www2012" -nice tar --create --dereference --directory="$T" "sotm-$D" | nice zstd --rsyncable -o "$T/$B" +nice tar --create --dereference --directory="$T" "sotm-$D" | nice zstd --quiet --rsyncable -o "$T/$B" nice rsync --preallocate --fuzzy "$T/$B" backup.openstreetmap.org::backup rm -rf "$T" -- 2.39.5