Fully qualify the name of the backup server

diff --git a/cookbooks/blog/templates/default/backup-birthday20.cron.erb b/cookbooks/blog/templates/default/backup-birthday20.cron.erb
index cef3d14eefb1e841c8ccf6c9753621e9c615fd31..fbc633ff6db674411bd8f973c486a1f2176d9095 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/blog/templates/default/backup-staging.cron.erb b/cookbooks/blog/templates/default/backup-staging.cron.erb
index 91169ed79a789c01446a0cd5ba54ab0c2339ea2e..35b0a77ffed52670e3070bf58fa8f17c98ab48b7 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index bc6159666e79bac886e06f3c70bc21ca4faf4843..9e3bea7d85bb8aedf56a59308cdb7ff6c8485fb8 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/blogs/templates/default/backup.cron.erb b/cookbooks/blogs/templates/default/backup.cron.erb
index 382989ab28c15d2f10a3b41db0a06e536f93902c..c020a5e35468921412c1a4037207346b3fe86dfd 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/chef/templates/default/server-backup.cron.erb b/cookbooks/chef/templates/default/server-backup.cron.erb
index 04e6c0e0c2363c1e0d61ad43f8b1dcd2d3da0fb9..9b864768ea35285ccdb4593d038002dc8c15acab 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/civicrm/templates/default/backup.cron.erb b/cookbooks/civicrm/templates/default/backup.cron.erb
index 7f912d7f7f9d1dc3e40cf095c3ddd88f6aa76fa1..7738f75ca2433f3c3a69f043fd35d485470c845f 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/community/templates/default/backup.cron.erb b/cookbooks/community/templates/default/backup.cron.erb
index 4cb919a769a1f35a96afa9d4bec4834212a24286..d23cd47e907e3a98ad05dfbf4e5aab18fc6f83a6 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/git/templates/default/backup.cron.erb b/cookbooks/git/templates/default/backup.cron.erb
index 63882720f436b1682647d8b7d5d5323aee837a71..b3404c7d5c4cd08826ce219402988aad261107db 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/mailman/templates/default/backup.cron.erb b/cookbooks/mailman/templates/default/backup.cron.erb
index 8d72d9d6000edad0f04b567cad8c8296024b9a30..cb0eda69d24f77a8f7a8852bd9637c1868f5f3a8 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb b/cookbooks/mediawiki/templates/default/mediawiki-backup.cron.erb
index 94ebb404ee00feef87ba1992f765de801847bded..533cc76b009ac3cf64202ef13618c45bb2457f9a 100755 (executable)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/osqa/templates/default/backup.cron.erb b/cookbooks/osqa/templates/default/backup.cron.erb
index 020a035497d6910ef7084151595cd514a03a32cf..5734bb1d4a6fe231ce4d0a08627ac3d1dccd5560 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/otrs/templates/default/backup.cron.erb b/cookbooks/otrs/templates/default/backup.cron.erb
index cc782c29cfbf4ea68eae0d2b12155e58606e9573..e7af774dc346d1d1906cf89273ab5a6b2412a28f 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/prometheus/templates/default/backup.cron.erb b/cookbooks/prometheus/templates/default/backup.cron.erb
index 3273aac61785e64d29639e05080749b7fdb7bda9..d239775994d8a9f96fcfab7b027a3395946d350e 100644 (file)
--- 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
 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
 
 rm -rf $T

diff --git a/cookbooks/stateofthemap/templates/default/backup.cron.erb b/cookbooks/stateofthemap/templates/default/backup.cron.erb
index e0f4d87bae534bd939006b8ea9a75460e9a879aa..e4922cf7ef1a83a538744dd3cbc878175af72e7a 100644 (file)
--- 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
 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
 
 rm -rf $T