From c9daa8ba35cd1e8d9e01dc32bf95013e0858ae19 Mon Sep 17 00:00:00 2001 From: Patrick Marchand Date: Mon, 8 Jun 2020 17:22:18 -0400 Subject: [PATCH] evobackup-client: Fix ssh connection test in zzz_evobackup.sh When I made the ssh key name a variable and defaulted it to id_ed25519, I forgot to change the hardcoded value for the ssh test in evobackup-client/templates/zzz_evobackup.default.sh.j2 --- CHANGELOG.md | 1 + evobackup-client/templates/zzz_evobackup.default.sh.j2 | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e556c71..dc08a807 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,7 @@ The **patch** part changes incrementally at each release. * certbot: restore compatibility with old Nginx * lxc-php: Install opensmtpd as intended * mongodb: fix logrotate patterm on Debian buster +* evobackup-client: fixed the ssh connection test ### Removed diff --git a/evobackup-client/templates/zzz_evobackup.default.sh.j2 b/evobackup-client/templates/zzz_evobackup.default.sh.j2 index f3674413..49de9744 100644 --- a/evobackup-client/templates/zzz_evobackup.default.sh.j2 +++ b/evobackup-client/templates/zzz_evobackup.default.sh.j2 @@ -1,5 +1,5 @@ #!/bin/sh -# Careful, the zzz_evobackup template was last updated on 2020/04/15 +# Careful, the zzz_evobackup template was last updated on 2020/06/08 # # Script Evobackup client # See https://gitea.evolix.org/evolix/evobackup @@ -76,7 +76,7 @@ test_server() { port=$(echo "${item}" | cut -d':' -f2) # Test if the server is accepting connections - ssh -q -o "ConnectTimeout ${SSH_CONNECT_TIMEOUT}" -i /root/.ssh/evobackup_id "${host}" -p "${port}" -t "exit" + ssh -q -o "ConnectTimeout ${SSH_CONNECT_TIMEOUT}" -i {{ evobackup_client__root_key_path }} "${host}" -p "${port}" -t "exit" # shellcheck disable=SC2181 if [ $? = 0 ]; then # SSH connection is OK