From 41d09962eb0c22adfe31a9482f0c5a45de47f5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Courr=C3=A8ges-Anglas?= Date: Wed, 13 May 2015 15:49:36 +0200 Subject: [PATCH] blowfish is slow and isn't supported on Jessie: let ssh decide cf. https://support.tranquil.it/issue648 --- libtisbackup/backup_rdiff.py | 2 +- libtisbackup/backup_rsync.py | 1 - libtisbackup/backup_rsync_btrfs.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libtisbackup/backup_rdiff.py b/libtisbackup/backup_rdiff.py index 746332e..ea63663 100644 --- a/libtisbackup/backup_rdiff.py +++ b/libtisbackup/backup_rdiff.py @@ -102,7 +102,7 @@ class backup_rdiff: if self.verbose==True: verbose_arg = "-P " - cmd = "rdiff-backup " + verbose_arg + ' --compress-level=9 --numeric-ids -az --partial -e "ssh -o StrictHostKeyChecking=no -c Blowfish -p ' + self.ssh_port + ' -i ' + self.private_key + '" --stats --delete-after ' + self.exclude_list + ' ' + src_server + ' ' + self.dest_dir + cmd = "rdiff-backup " + verbose_arg + ' --compress-level=9 --numeric-ids -az --partial -e "ssh -o StrictHostKeyChecking=no -p ' + self.ssh_port + ' -i ' + self.private_key + '" --stats --delete-after ' + self.exclude_list + ' ' + src_server + ' ' + self.dest_dir print cmd ## deal with exit code 24 (file vanished) diff --git a/libtisbackup/backup_rsync.py b/libtisbackup/backup_rsync.py index 07edcce..93b877a 100644 --- a/libtisbackup/backup_rsync.py +++ b/libtisbackup/backup_rsync.py @@ -313,7 +313,6 @@ class backup_rsync_ssh(backup_rsync): type = 'rsync+ssh' required_params = backup_generic.required_params + ['remote_user','remote_dir','private_key'] optional_params = backup_generic.optional_params + ['compression','bwlimit','ssh_port','exclude_list','protect_args','overload_args', 'cipher_spec'] - cipher_spec = 'blowfish' register_driver(backup_rsync) diff --git a/libtisbackup/backup_rsync_btrfs.py b/libtisbackup/backup_rsync_btrfs.py index a89f2b2..be13d87 100644 --- a/libtisbackup/backup_rsync_btrfs.py +++ b/libtisbackup/backup_rsync_btrfs.py @@ -149,7 +149,7 @@ class backup_rsync_btrfs(backup_generic): backup_source = '%s@%s::%s%s' % (self.remote_user, self.server_name, self.rsync_module, self.remote_dir) else: # case of rsync + ssh - ssh_params = ['-o StrictHostKeyChecking=no','-c blowfish'] + ssh_params = ['-o StrictHostKeyChecking=no'] if self.private_key: ssh_params.append('-i %s' % self.private_key) if self.ssh_port <> 22: