1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-22 03:06:55 +00:00

added rsync options for ssh identity support

Signed-off-by: Bernard `Guyzmo` Pratz <guyzmo+github@m0g.net>
This commit is contained in:
Bernard `Guyzmo` Pratz 2016-01-14 23:18:48 +00:00
parent 161b5236b6
commit c327736da2

View File

@ -58,6 +58,7 @@ def backup_status(env):
"--gpg-options", "--cipher-algo=AES256", "--gpg-options", "--cipher-algo=AES256",
"--log-fd", "1", "--log-fd", "1",
"--ssh-options='-i /root/.ssh/id_rsa_miab'", "--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"], config["target"],
], ],
get_env(env), get_env(env),
@ -251,6 +252,7 @@ def perform_backup(full_backup):
"--gpg-options", "--cipher-algo=AES256", "--gpg-options", "--cipher-algo=AES256",
env["STORAGE_ROOT"], env["STORAGE_ROOT"],
"--ssh-options='-i /root/.ssh/id_rsa_miab'", "--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"], config["target"],
"--allow-source-mismatch" "--allow-source-mismatch"
], ],
@ -275,6 +277,7 @@ def perform_backup(full_backup):
"--archive-dir", backup_cache_dir, "--archive-dir", backup_cache_dir,
"--force", "--force",
"--ssh-options='-i /root/.ssh/id_rsa_miab'", "--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"] config["target"]
], ],
get_env(env)) get_env(env))
@ -291,6 +294,7 @@ def perform_backup(full_backup):
"--archive-dir", backup_cache_dir, "--archive-dir", backup_cache_dir,
"--force", "--force",
"--ssh-options='-i /root/.ssh/id_rsa_miab'", "--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"] config["target"]
], ],
get_env(env)) get_env(env))
@ -330,6 +334,7 @@ def run_duplicity_verification():
"--archive-dir", backup_cache_dir, "--archive-dir", backup_cache_dir,
"--exclude", backup_root, "--exclude", backup_root,
"--ssh-options='-i /root/.ssh/id_rsa_miab'", "--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"], config["target"],
env["STORAGE_ROOT"], env["STORAGE_ROOT"],
], get_env(env)) ], get_env(env))
@ -343,6 +348,7 @@ def run_duplicity_restore(args):
"restore", "restore",
"--archive-dir", backup_cache_dir, "--archive-dir", backup_cache_dir,
"--ssh-options='-i /root/.ssh/id_rsa_miab'", "--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"], config["target"],
] + args, ] + args,
get_env(env)) get_env(env))