From 0152852eb43d42ec0b2e2c30ce784983a8e2c35c 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 17:38:05 +0200 Subject: [PATCH] Re-add cipher_spec optional setting, this time with no default value --- libtisbackup/backup_rsync.py | 5 ++++- libtisbackup/backup_rsync_btrfs.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libtisbackup/backup_rsync.py b/libtisbackup/backup_rsync.py index 8d08889..226f63f 100644 --- a/libtisbackup/backup_rsync.py +++ b/libtisbackup/backup_rsync.py @@ -142,6 +142,8 @@ class backup_rsync(backup_generic): ssh_params = ['-o StrictHostKeyChecking=no'] if self.private_key: ssh_params.append('-i %s' % self.private_key) + if self.cipher_spec: + ssh_params.append('-c %s' % self.cipher_spec) if self.ssh_port <> 22: ssh_params.append('-p %i' % self.ssh_port) options.append('-e "/usr/bin/ssh %s"' % (" ".join(ssh_params))) @@ -310,7 +312,8 @@ class backup_rsync_ssh(backup_rsync): """Backup a directory on remote server with rsync and ssh protocol (requires rsync software on remote host)""" 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'] + optional_params = backup_generic.optional_params + ['compression','bwlimit','ssh_port','exclude_list','protect_args','overload_args', 'cipher_spec'] + cipher_spec = '' register_driver(backup_rsync) diff --git a/libtisbackup/backup_rsync_btrfs.py b/libtisbackup/backup_rsync_btrfs.py index be13d87..66b892c 100644 --- a/libtisbackup/backup_rsync_btrfs.py +++ b/libtisbackup/backup_rsync_btrfs.py @@ -152,6 +152,8 @@ class backup_rsync_btrfs(backup_generic): ssh_params = ['-o StrictHostKeyChecking=no'] if self.private_key: ssh_params.append('-i %s' % self.private_key) + if self.cipher_spec: + ssh_params.append('-c %s' % self.cipher_spec) if self.ssh_port <> 22: ssh_params.append('-p %i' % self.ssh_port) options.append('-e "/usr/bin/ssh %s"' % (" ".join(ssh_params))) @@ -335,7 +337,8 @@ class backup_rsync__btrfs_ssh(backup_rsync_btrfs): """Backup a directory on remote server with rsync,ssh and btrfs protocol (requires rsync software on remote host)""" type = 'rsync+btrfs+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'] + optional_params = backup_generic.optional_params + ['compression','bwlimit','ssh_port','exclude_list','protect_args','overload_args','cipher_spec'] + cipher_spec = '' register_driver(backup_rsync_btrfs)