Set internal rsync over ssh backups to use arcfour (rc4) for performance

diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index b64c4f072cd3e9be9ff70807f3a76cffba95c54a..7698bc334c9aed5166779c6e7f3da03dca7f0f00 100644 (file)
--- a/cookbooks/blog/templates/default/backup.cron.erb
+++ b/cookbooks/blog/templates/default/backup.cron.erb
@@ -11,6 +11,7 @@ mysqldump --user=osm-blog-user --password=<%= @passwords["osm-blog-user"] %> --o
 ln -s /srv/blog.openstreetmap.org $T/osm-blog-$D/www
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B osm-blog-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/civicrm/templates/default/backup.cron.erb b/cookbooks/civicrm/templates/default/backup.cron.erb
index 55657a69ddfd7ed75277bc769141a1844f4552c3..4a5469ed421fd74975a74b59e9caaaa6dfd83092 100644 (file)
--- a/cookbooks/civicrm/templates/default/backup.cron.erb
+++ b/cookbooks/civicrm/templates/default/backup.cron.erb
@@ -11,6 +11,7 @@ mysqldump --user=civicrm --password=<%= @passwords["database"] %> --opt --skip-l
 ln -s /data/crm.osmfoundation.org $T/osmf-crm-$D/www
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B osmf-crm-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/db/templates/default/backup-db.erb b/cookbooks/db/templates/default/backup-db.erb
index 3ad1020c4d7dfba5a98abaaf178df19e61292186..04eaeebd7c3c0028959cef731ce6ef9939b686f3 100644 (file)
--- a/cookbooks/db/templates/default/backup-db.erb
+++ b/cookbooks/db/templates/default/backup-db.erb
@@ -7,6 +7,7 @@ F=/tmp/osm-${D}.dmp
 
 pg_dump --user=backup --format=custom --file=$F openstreetmap
 
+export RSYNC_RSH="ssh -ax -c arcfour"
 rsync $F backup.openstreetmap.org::backup
 
 rm -f $F

diff --git a/cookbooks/git/templates/default/backup.cron.erb b/cookbooks/git/templates/default/backup.cron.erb
index 13f1067b16ec56f0ad95ddb2ca9c499e10c692c1..6344e09b5a5ea297231dd3d0a8cf9732e3f79717 100644 (file)
--- a/cookbooks/git/templates/default/backup.cron.erb
+++ b/cookbooks/git/templates/default/backup.cron.erb
@@ -9,6 +9,7 @@ B=<%= node[:git][:backup] %>-$D.tar.gz
 ln -s /var/lib/git $T/git-$D
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B git-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/mailman/templates/default/backup.cron.erb b/cookbooks/mailman/templates/default/backup.cron.erb
index 486694a1e924522052666e525bda7393fe3edcb3..84d032188073005547e20813a14d846b13af6698 100644 (file)
--- a/cookbooks/mailman/templates/default/backup.cron.erb
+++ b/cookbooks/mailman/templates/default/backup.cron.erb
@@ -10,6 +10,7 @@ mkdir $T/lists-$D
 ln -s /var/lib/mailman $T/lists-$D/mailman
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B lists-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/nominatim/templates/default/backup-nominatim.erb b/cookbooks/nominatim/templates/default/backup-nominatim.erb
index 353e802e489642e52a0fd2640699a1f05876e36e..418195074d9f40b7405d6d44f033c25b403a2ab4 100644 (file)
--- a/cookbooks/nominatim/templates/default/backup-nominatim.erb
+++ b/cookbooks/nominatim/templates/default/backup-nominatim.erb
@@ -14,6 +14,7 @@ F=/tmp/nominatim-${D}.dmp
 
 pg_dump --file=$F -F c -Z 9 -t 'country' -t file -t '*columns' -t 'import_polygon_*' -t import_status -t place_addressline -t placex -t search_name -t 'seq_*' -t word <%= node[:nominatim][:database][:dbname] %>
 
+export RSYNC_RSH="ssh -ax -c arcfour"
 rsync $F backup.openstreetmap.org::backup
 
 rm -f $F

diff --git a/cookbooks/otrs/templates/default/backup.cron.erb b/cookbooks/otrs/templates/default/backup.cron.erb
index d377de86fef0bbf4fea27c0a2f9188f05ff3e24b..4be1ce99f32f4a54afb8815a5a439b33520dc41b 100644 (file)
--- a/cookbooks/otrs/templates/default/backup.cron.erb
+++ b/cookbooks/otrs/templates/default/backup.cron.erb
@@ -14,6 +14,7 @@ ln -s /opt/otrs $T/otrs-$D/otrs
 ln -s /etc/apache2/sites-available/otrs.openstreetmap.org $T/otrs-$D/apache2-otrs.openstreetmap.org
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B otrs-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/stateofthemap/templates/default/backup.cron.erb b/cookbooks/stateofthemap/templates/default/backup.cron.erb
index e78b50348cadcca6d52c72984a49538c72cb26a2..86795a810041b5162ef79b057e257acaff24a8c4 100644 (file)
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -20,6 +20,7 @@ ln -s /srv/2011.stateofthemap.org $T/sotm-$D/www2011
 ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B sotm-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/subversion/templates/default/backup.cron.erb b/cookbooks/subversion/templates/default/backup.cron.erb
index ac3852a1c1f3cd2cefabb5e3f4fe6e73140a36bf..9950024a99ebce0e2a4ad8990e947380bfc67754 100644 (file)
--- a/cookbooks/subversion/templates/default/backup.cron.erb
+++ b/cookbooks/subversion/templates/default/backup.cron.erb
@@ -9,6 +9,7 @@ B=svn-$D.tar.gz
 nice svnadmin hotcopy /var/lib/subversion/repos/openstreetmap $T/svn-$D > /dev/null
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --directory=$T --file=$T/$B svn-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/thinkup/templates/default/backup.cron.erb b/cookbooks/thinkup/templates/default/backup.cron.erb
index ecdba2ec4f2c90118d52f0cbaeb7a69a5164e5fd..d461717960ecb593ecaf81a70d0c189d13b1a098 100644 (file)
--- a/cookbooks/thinkup/templates/default/backup.cron.erb
+++ b/cookbooks/thinkup/templates/default/backup.cron.erb
@@ -11,6 +11,7 @@ mysqldump --user=thinkup --password=<%= @passwords["database"] %> --opt thinkup
 ln -s /srv/thinkup.openstreetmap.org $T/thinkup-$D/www
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B thinkup-$D
 nice rsync $T/$B backup::backup

diff --git a/cookbooks/trac/templates/default/backup.cron.erb b/cookbooks/trac/templates/default/backup.cron.erb
index 06f6de9612aa03588ef2ac70fa5cd15ce95c8bc2..bfc9c0305be1cdc73735de7b0f0c16fd30e67232 100644 (file)
--- a/cookbooks/trac/templates/default/backup.cron.erb
+++ b/cookbooks/trac/templates/default/backup.cron.erb
@@ -9,6 +9,7 @@ B=trac-$D.tar.gz
 trac-admin /var/lib/trac hotcopy $T/trac-$D > /dev/null
 
 export GZIP="--rsyncable -9"
+export RSYNC_RSH="ssh -ax -c arcfour"
 
 nice tar --create --gzip --directory=$T --file=$T/$B trac-$D
 nice rsync $T/$B backup::backup