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

Re-add cipher_spec optional setting, this time with no default value

Browse Source
This commit is contained in:
Jérémie Courrèges-Anglas 2015-05-13 17:38:05 +02:00
parent 94335e6d23
commit 0152852eb4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libtisbackup/backup_rsync.py
View File

@ -142,6 +142,8 @@ class backup_rsync(backup_generic):
ssh_params = ['-o StrictHostKeyChecking=no'] 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.cipher_spec:
ssh_params.append('-c %s' % self.cipher_spec)
if self.ssh_port <> 22: if self.ssh_port <> 22:
ssh_params.append('-p %i' % self.ssh_port) ssh_params.append('-p %i' % self.ssh_port)
options.append('-e "/usr/bin/ssh %s"' % (" ".join(ssh_params))) 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)""" """Backup a directory on remote server with rsync and ssh protocol (requires rsync software on remote host)"""
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'] optional_params = backup_generic.optional_params + ['compression','bwlimit','ssh_port','exclude_list','protect_args','overload_args', 'cipher_spec']
cipher_spec = ''
register_driver(backup_rsync) register_driver(backup_rsync)

5
libtisbackup/backup_rsync_btrfs.py
View File

@ -152,6 +152,8 @@ class backup_rsync_btrfs(backup_generic):
ssh_params = ['-o StrictHostKeyChecking=no'] 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.cipher_spec:
ssh_params.append('-c %s' % self.cipher_spec)
if self.ssh_port <> 22: if self.ssh_port <> 22:
ssh_params.append('-p %i' % self.ssh_port) ssh_params.append('-p %i' % self.ssh_port)
options.append('-e "/usr/bin/ssh %s"' % (" ".join(ssh_params))) 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)""" """Backup a directory on remote server with rsync,ssh and btrfs protocol (requires rsync software on remote host)"""
type = 'rsync+btrfs+ssh' type = 'rsync+btrfs+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'] 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) register_driver(backup_rsync_btrfs)