From c327736da2c39923c4cecdf2ff3a1cfacd972ce6 Mon Sep 17 00:00:00 2001 From: Bernard `Guyzmo` Pratz Date: Thu, 14 Jan 2016 23:18:48 +0000 Subject: [PATCH] added rsync options for ssh identity support Signed-off-by: Bernard `Guyzmo` Pratz --- management/backup.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/management/backup.py b/management/backup.py index 0ba1a95a..9a74fe60 100755 --- a/management/backup.py +++ b/management/backup.py @@ -58,6 +58,7 @@ def backup_status(env): "--gpg-options", "--cipher-algo=AES256", "--log-fd", "1", "--ssh-options='-i /root/.ssh/id_rsa_miab'", + "--rsync-options=-e \"/usr/bin/ssh -oBatchMode=yes -p 22 -i /root/.ssh/id_rsa_miab\"", config["target"], ], get_env(env), @@ -251,6 +252,7 @@ def perform_backup(full_backup): "--gpg-options", "--cipher-algo=AES256", env["STORAGE_ROOT"], "--ssh-options='-i /root/.ssh/id_rsa_miab'", + "--rsync-options=-e \"/usr/bin/ssh -oBatchMode=yes -p 22 -i /root/.ssh/id_rsa_miab\"", config["target"], "--allow-source-mismatch" ], @@ -275,6 +277,7 @@ def perform_backup(full_backup): "--archive-dir", backup_cache_dir, "--force", "--ssh-options='-i /root/.ssh/id_rsa_miab'", + "--rsync-options=-e \"/usr/bin/ssh -oBatchMode=yes -p 22 -i /root/.ssh/id_rsa_miab\"", config["target"] ], get_env(env)) @@ -291,6 +294,7 @@ def perform_backup(full_backup): "--archive-dir", backup_cache_dir, "--force", "--ssh-options='-i /root/.ssh/id_rsa_miab'", + "--rsync-options=-e \"/usr/bin/ssh -oBatchMode=yes -p 22 -i /root/.ssh/id_rsa_miab\"", config["target"] ], get_env(env)) @@ -330,6 +334,7 @@ def run_duplicity_verification(): "--archive-dir", backup_cache_dir, "--exclude", backup_root, "--ssh-options='-i /root/.ssh/id_rsa_miab'", + "--rsync-options=-e \"/usr/bin/ssh -oBatchMode=yes -p 22 -i /root/.ssh/id_rsa_miab\"", config["target"], env["STORAGE_ROOT"], ], get_env(env)) @@ -343,6 +348,7 @@ def run_duplicity_restore(args): "restore", "--archive-dir", backup_cache_dir, "--ssh-options='-i /root/.ssh/id_rsa_miab'", + "--rsync-options=-e \"/usr/bin/ssh -oBatchMode=yes -p 22 -i /root/.ssh/id_rsa_miab\"", config["target"], ] + args, get_env(env))