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 7698bc334c9aed5166779c6e7f3da03dca7f0f00..d6fc5a79063ffa14d96a4660fe4c424b2c7e9def 100644 (file)
--- 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 9a215561670601be1e32b04b54def0382ec85598..202469c877b98db35659cd8a9ff93bdf4967f671 100644 (file)
--- 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 4f52e24d1f0468f174af9ba1cfa782d796916c5e..492dded40be76318cc17b0612f4275237965834b 100644 (file)
--- 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 31fd20563b2fb200620c9a6536a64f0a4042cc1e..41119794e87a6f4986ad8026e42daf530c5dc3e9 100644 (file)
--- 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 6344e09b5a5ea297231dd3d0a8cf9732e3f79717..29e059b45e614592d612c5632887b9c45893bcb7 100644 (file)
--- 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 84d032188073005547e20813a14d846b13af6698..80a5c8ba2d7c89d745f60d8b55cc2f965913cbf1 100644 (file)
--- 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 80e78c43f70eff50855a48b1fa9a41d955c91aed..33ac59256058b0850ed6ec6631f4d18ed8e8e395 100644 (file)
--- 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 2e008ba422a2fe3900b1ee70894c9033980148ae..09711cc43de11fee31cab3f8956dea03b4477c52 100644 (file)
--- 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 28b4a0fbfa7c41be586470435aad3173238fe9f6..e9d0e7352a8ad1ca48bbe5cf6299ccb98449de0f 100644 (file)
--- 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 ccbb3c2d509d8a2bec49c2b44d7750a1414937c9..6724e3ca4c50d576f6a82a621b6f7b120d1da125 100644 (file)
--- 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 30937d2cb8f23fb9ad6efcb6d688d31932172be6..a8e1da21c5d1daa8a494496854b6f04f9bf69c05 100644 (file)
--- 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 9950024a99ebce0e2a4ad8990e947380bfc67754..750cf47ce33ccf72f745139817cd8ea17a7aacc0 100644 (file)
--- 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 d461717960ecb593ecaf81a70d0c189d13b1a098..3460cbe485947e39372d4dfc222ccf3369727e16 100644 (file)
--- 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 bfc9c0305be1cdc73735de7b0f0c16fd30e67232..6d92f3a7e4f2063e4d0a54b5a52e80fd2a7ac034 100644 (file)
--- 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