From: Grant Slater <git@firefishy.com>
Date: Tue, 14 Jul 2015 07:10:18 +0000 (+0100)
Subject: Remove arcfour (RC4) cipher no longer available in newer OpenSSH
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/51096343cee85550cd197da1f8354f8407506af5

Remove arcfour (RC4) cipher no longer available in newer OpenSSH
---

diff --git a/cookbooks/blog/templates/default/backup.cron.erb b/cookbooks/blog/templates/default/backup.cron.erb
index 7698bc334..d6fc5a790 100644
--- a/cookbooks/blog/templates/default/backup.cron.erb
+++ b/cookbooks/blog/templates/default/backup.cron.erb
@@ -11,7 +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"
+export RSYNC_RSH="ssh -ax"
 
 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 9a2155616..202469c87 100644
--- a/cookbooks/civicrm/templates/default/backup.cron.erb
+++ b/cookbooks/civicrm/templates/default/backup.cron.erb
@@ -11,7 +11,7 @@ mysqldump --user=civicrm --password=<%= @passwords["database"] %> --opt --skip-l
 ln -s /srv/join.osmfoundation.org $T/osmf-crm-$D/www
 
 export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 
 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 4f52e24d1..492dded40 100644
--- a/cookbooks/db/templates/default/backup-db.erb
+++ b/cookbooks/db/templates/default/backup-db.erb
@@ -7,7 +7,7 @@ F=/store/backup/osm-${D}.dmp
 
 pg_dump --user=backup --format=custom --file=$F openstreetmap
 
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 rsync $F backup.openstreetmap.org::backup
 
 rm -f $F
diff --git a/cookbooks/forum/templates/default/backup.cron.erb b/cookbooks/forum/templates/default/backup.cron.erb
index 31fd20563..41119794e 100644
--- a/cookbooks/forum/templates/default/backup.cron.erb
+++ b/cookbooks/forum/templates/default/backup.cron.erb
@@ -12,7 +12,7 @@ mysqldump --user=forum --password=<%= @passwords["database"] %> --opt forum > $T
 ln -s /srv/forum.openstreetmap.org $T/forum-$D/www
 
 export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B forum-$D
 nice rsync $T/$B backup::backup
diff --git a/cookbooks/git/templates/default/backup.cron.erb b/cookbooks/git/templates/default/backup.cron.erb
index 6344e09b5..29e059b45 100644
--- a/cookbooks/git/templates/default/backup.cron.erb
+++ b/cookbooks/git/templates/default/backup.cron.erb
@@ -9,7 +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"
+export RSYNC_RSH="ssh -ax"
 
 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 84d032188..80a5c8ba2 100644
--- a/cookbooks/mailman/templates/default/backup.cron.erb
+++ b/cookbooks/mailman/templates/default/backup.cron.erb
@@ -10,7 +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"
+export RSYNC_RSH="ssh -ax"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B lists-$D
 nice rsync $T/$B backup::backup
diff --git a/cookbooks/munin/templates/default/backup.cron.erb b/cookbooks/munin/templates/default/backup.cron.erb
index 80e78c43f..33ac59256 100644
--- a/cookbooks/munin/templates/default/backup.cron.erb
+++ b/cookbooks/munin/templates/default/backup.cron.erb
@@ -7,7 +7,7 @@ D=$(date +%Y-%m-%d)
 B=munin-$D.tar.gz
 
 export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 
 nice tar --create --gzip --dereference --directory=/var/lib/munin --file=$T/$B openstreetmap *.storable
 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 2e008ba42..09711cc43 100644
--- a/cookbooks/nominatim/templates/default/backup-nominatim.erb
+++ b/cookbooks/nominatim/templates/default/backup-nominatim.erb
@@ -14,7 +14,7 @@ F=/tmp/nominatim-${D}.dmp
 
 pg_dump --file=$F -F c -Z 9 -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"
+export RSYNC_RSH="ssh -ax"
 rsync $F backup.openstreetmap.org::backup
 
 rm -f $F
diff --git a/cookbooks/osqa/templates/default/backup.cron.erb b/cookbooks/osqa/templates/default/backup.cron.erb
index 28b4a0fbf..e9d0e7352 100644
--- a/cookbooks/osqa/templates/default/backup.cron.erb
+++ b/cookbooks/osqa/templates/default/backup.cron.erb
@@ -13,7 +13,7 @@ sudo -u <%= @user %> pg_dump --format=custom --file=$T/<%= @name %>-$D/osqa.dmp
 ln -s <%= @directory %>/upfiles $T/<%= @name %>-$D/upfiles
 
 export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 
 nice tar --create --gzip --dereference --directory=$T --file=$T/$B <%= @name %>-$D
 nice rsync $T/$B backup::backup
diff --git a/cookbooks/otrs/templates/default/backup.cron.erb b/cookbooks/otrs/templates/default/backup.cron.erb
index ccbb3c2d5..6724e3ca4 100644
--- a/cookbooks/otrs/templates/default/backup.cron.erb
+++ b/cookbooks/otrs/templates/default/backup.cron.erb
@@ -14,7 +14,7 @@ ln -s /opt/otrs $T/otrs-$D/otrs
 ln -s /etc/apache2/sites-available/otrs.openstreetmap.org.conf $T/otrs-$D/apache2-otrs.openstreetmap.org.conf
 
 export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 
 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 30937d2cb..a8e1da21c 100644
--- a/cookbooks/stateofthemap/templates/default/backup.cron.erb
+++ b/cookbooks/stateofthemap/templates/default/backup.cron.erb
@@ -21,7 +21,7 @@ ln -s /srv/2012.stateofthemap.org $T/sotm-$D/www2012
 ln -s /srv/2016.stateofthemap.org $T/sotm-$D/www2016
 
 export GZIP="--rsyncable -9"
-export RSYNC_RSH="ssh -ax -c arcfour"
+export RSYNC_RSH="ssh -ax"
 
 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 9950024a9..750cf47ce 100644
--- a/cookbooks/subversion/templates/default/backup.cron.erb
+++ b/cookbooks/subversion/templates/default/backup.cron.erb
@@ -9,7 +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"
+export RSYNC_RSH="ssh -ax"
 
 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 d46171796..3460cbe48 100644
--- a/cookbooks/thinkup/templates/default/backup.cron.erb
+++ b/cookbooks/thinkup/templates/default/backup.cron.erb
@@ -11,7 +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"
+export RSYNC_RSH="ssh -ax"
 
 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 bfc9c0305..6d92f3a7e 100644
--- a/cookbooks/trac/templates/default/backup.cron.erb
+++ b/cookbooks/trac/templates/default/backup.cron.erb
@@ -9,7 +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"
+export RSYNC_RSH="ssh -ax"
 
 nice tar --create --gzip --directory=$T --file=$T/$B trac-$D
 nice rsync $T/$B backup::backup