From 3ae5b9b4fbb5a637df5a9e8138cd421e0c6e74e7 Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Tue, 22 Oct 2013 10:47:30 +0100
Subject: [PATCH 1/1] Set internal rsync over ssh backups to use arcfour (rc4)
 for performance

---
 cookbooks/blog/templates/default/backup.cron.erb           | 1 +
 cookbooks/civicrm/templates/default/backup.cron.erb        | 1 +
 cookbooks/db/templates/default/backup-db.erb               | 1 +
 cookbooks/git/templates/default/backup.cron.erb            | 1 +
 cookbooks/mailman/templates/default/backup.cron.erb        | 1 +
 cookbooks/nominatim/templates/default/backup-nominatim.erb | 1 +
 cookbooks/otrs/templates/default/backup.cron.erb           | 1 +
 cookbooks/stateofthemap/templates/default/backup.cron.erb  | 1 +
 cookbooks/subversion/templates/default/backup.cron.erb     | 1 +
 cookbooks/thinkup/templates/default/backup.cron.erb        | 1 +
 cookbooks/trac/templates/default/backup.cron.erb           | 1 +
 11 files changed, 11 insertions(+)

diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index b64c4f072..7698bc334 100644
--- 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 55657a69d..4a5469ed4 100644
--- 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 3ad1020c4..04eaeebd7 100644
--- 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 13f1067b1..6344e09b5 100644
--- 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 486694a1e..84d032188 100644
--- 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 353e802e4..418195074 100644
--- 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 d377de86f..4be1ce99f 100644
--- 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 e78b50348..86795a810 100644
--- 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 ac3852a1c..9950024a9 100644
--- 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 ecdba2ec4..d46171796 100644
--- 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 06f6de961..bfc9c0305 100644
--- 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
-- 
2.43.2