k3nny/TISbackup
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blowfish is slow and isn't supported on Jessie: let ssh decide

Browse Source 
cf. https://support.tranquil.it/issue648
This commit is contained in:
Jérémie Courrèges-Anglas 2015-05-13 15:49:36 +02:00
parent 53b0d44ead
commit 41d09962eb
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libtisbackup/backup_rdiff.py
View File

@ -102,7 +102,7 @@ class backup_rdiff:
if self.verbose==True: if self.verbose==True:
verbose_arg = "-P " 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 print cmd
## deal with exit code 24 (file vanished) ## deal with exit code 24 (file vanished)

1
libtisbackup/backup_rsync.py
View File

@ -313,7 +313,6 @@ class backup_rsync_ssh(backup_rsync):
type = 'rsync+ssh' type = 'rsync+ssh'
required_params = backup_generic.required_params + ['remote_user','remote_dir','private_key'] 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'] 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) register_driver(backup_rsync)

2
libtisbackup/backup_rsync_btrfs.py
View File

@ -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) backup_source = '%s@%s::%s%s' % (self.remote_user, self.server_name, self.rsync_module, self.remote_dir)
else: else:
# case of rsync + ssh # case of rsync + ssh
ssh_params = ['-o StrictHostKeyChecking=no','-c blowfish'] ssh_params = ['-o StrictHostKeyChecking=no']
if self.private_key: if self.private_key:
ssh_params.append('-i %s' % self.private_key) ssh_params.append('-i %s' % self.private_key)
if self.ssh_port <> 22: if self.ssh_port <> 22: