From 462ac9b55aee40da858bcf4689353a64aeced924 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 19 Aug 2024 08:35:24 +0100 Subject: [PATCH] Fully qualify the name of the backup server --- cookbooks/blog/templates/default/backup-birthday20.cron.erb | 2 +- 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 +- cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb | 2 +- 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 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cookbooks/blog/templates/default/backup-birthday20.cron.erb b/cookbooks/blog/templates/default/backup-birthday20.cron.erb index cef3d14ee..fbc633ff6 100644 --- a/cookbooks/blog/templates/default/backup-birthday20.cron.erb +++ b/cookbooks/blog/templates/default/backup-birthday20.cron.erb @@ -16,6 +16,6 @@ ln -s /srv/birthday20.openstreetmap.org $T/osm-birthday20-$D/www export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T --warning=no-file-changed osm-birthday20-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +nice rsync --preallocate --fuzzy $T/$B backup.openstreetmap.org::backup rm -rf $T diff --git a/cookbooks/blog/templates/default/backup-staging.cron.erb b/cookbooks/blog/templates/default/backup-staging.cron.erb index 91169ed79..35b0a77ff 100644 --- a/cookbooks/blog/templates/default/backup-staging.cron.erb +++ b/cookbooks/blog/templates/default/backup-staging.cron.erb @@ -16,6 +16,6 @@ ln -s /srv/staging.blog.openstreetmap.org $T/osm-blog-staging-$D/www export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T --warning=no-file-changed osm-blog-staging-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 bc6159666..9e3bea7d8 100644 --- a/cookbooks/blog/templates/default/backup.cron.erb +++ b/cookbooks/blog/templates/default/backup.cron.erb @@ -16,6 +16,6 @@ ln -s /srv/blog.openstreetmap.org $T/osm-blog-$D/www export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T --warning=no-file-changed osm-blog-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 382989ab2..c020a5e35 100644 --- a/cookbooks/blogs/templates/default/backup.cron.erb +++ b/cookbooks/blogs/templates/default/backup.cron.erb @@ -12,6 +12,6 @@ sqlite3 /srv/blogs.openstreetmap.org/planet.db ".backup $T/blogs-$D/planet.db" export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T blogs-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 04e6c0e0c..9b864768e 100644 --- a/cookbooks/chef/templates/default/server-backup.cron.erb +++ b/cookbooks/chef/templates/default/server-backup.cron.erb @@ -11,6 +11,6 @@ sudo -u opscode-pgsql /opt/opscode/embedded/bin/pg_dumpall --file=$T/chef-server ln -s /var/opt/opscode/bookshelf/data $T/chef-server-$D/bookshelf nice tar --create --dereference --directory=$T chef-server-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 7f912d7f7..7738f75ca 100644 --- a/cookbooks/civicrm/templates/default/backup.cron.erb +++ b/cookbooks/civicrm/templates/default/backup.cron.erb @@ -16,6 +16,6 @@ ln -s /srv/supporting.openstreetmap.org $T/osmf-crm-$D/www export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T osmf-crm-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 4cb919a76..d23cd47e9 100644 --- a/cookbooks/community/templates/default/backup.cron.erb +++ b/cookbooks/community/templates/default/backup.cron.erb @@ -15,6 +15,6 @@ ln -s /srv/community.openstreetmap.org/shared/data/postgres_backup $T/community- export RSYNC_RSH="ssh -ax" nice tar --create --numeric-owner --dereference --directory=$T --warning=no-file-changed community-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 63882720f..b3404c7d5 100644 --- a/cookbooks/git/templates/default/backup.cron.erb +++ b/cookbooks/git/templates/default/backup.cron.erb @@ -11,6 +11,6 @@ ln -s /var/lib/git $T/git-$D export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T git-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 8d72d9d60..cb0eda69d 100644 --- a/cookbooks/mailman/templates/default/backup.cron.erb +++ b/cookbooks/mailman/templates/default/backup.cron.erb @@ -12,6 +12,6 @@ ln -s /var/lib/mailman $T/lists-$D/mailman export RSYNC_RSH="ssh -ax" nice tar --create --dereference --warning=no-file-changed --warning=no-file-removed --directory=$T lists-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 94ebb404e..533cc76b0 100755 --- a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb +++ b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb @@ -10,6 +10,6 @@ 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] %>" | lz4 -9 > $T/wiki-<%= @name %>-$D/wiki.sql.lz4 ln -s <%= @directory %> $T/wiki-<%= @name %>-$D/www nice tar --create --dereference --directory=$T --warning=no-file-changed --warning=no-file-removed --exclude=wiki-<%= @name %>-$D/www/w/images/thumb --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 gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 020a03549..5734bb1d4 100644 --- a/cookbooks/osqa/templates/default/backup.cron.erb +++ b/cookbooks/osqa/templates/default/backup.cron.erb @@ -15,6 +15,6 @@ ln -s <%= @directory %>/upfiles $T/<%= @name %>-$D/upfiles export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T <%= @name %>-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 cc782c29c..e7af774dc 100644 --- a/cookbooks/otrs/templates/default/backup.cron.erb +++ b/cookbooks/otrs/templates/default/backup.cron.erb @@ -16,6 +16,6 @@ ln -s /etc/apache2/sites-available/otrs.openstreetmap.org.conf $T/otrs-$D/apache export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T otrs-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 3273aac61..d23977599 100644 --- a/cookbooks/prometheus/templates/default/backup.cron.erb +++ b/cookbooks/prometheus/templates/default/backup.cron.erb @@ -14,6 +14,6 @@ ln -s /var/lib/grafana $T/prometheus-$D/grafana export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T prometheus-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +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 e0f4d87ba..e4922cf7e 100644 --- a/cookbooks/stateofthemap/templates/default/backup.cron.erb +++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb @@ -25,6 +25,6 @@ ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012 export RSYNC_RSH="ssh -ax" nice tar --create --dereference --directory=$T sotm-$D | nice gzip --rsyncable -9 > $T/$B -nice rsync --preallocate --fuzzy $T/$B backup::backup +nice rsync --preallocate --fuzzy $T/$B backup.openstreetmap.org::backup rm -rf $T -- 2.39.5