diff --git a/RebuildBdd/rebuild-bdd-core.sh b/RebuildBdd/rebuild-bdd-core.sh index 735e7be..0b49c7c 100755 --- a/RebuildBdd/rebuild-bdd-core.sh +++ b/RebuildBdd/rebuild-bdd-core.sh @@ -106,12 +106,12 @@ download_remote_file() { local_dir="$(dirname "$local_path")" mkdir -p "$local_dir" || fail "impossible de créer le dossier local de restauration : $local_dir" - if scp "${SSH_OPTS[@]}" "${REMOTE_SSH}:${remote_path}" "$local_path" >>"$LOG_FILE" 2>&1; then + if scp "${SCP_OPTS[@]}" "${REMOTE_SSH}:${remote_path}" "$local_path" >>"$LOG_FILE" 2>&1; then return 0 fi log "Téléchargement scp standard échoué, tentative avec scp -O" - scp -O "${SSH_OPTS[@]}" "${REMOTE_SSH}:${remote_path}" "$local_path" >>"$LOG_FILE" 2>&1 + scp -O "${SCP_OPTS[@]}" "${REMOTE_SSH}:${remote_path}" "$local_path" >>"$LOG_FILE" 2>&1 } to_bool_yes_no() { @@ -272,6 +272,15 @@ SSH_OPTS=( -o StrictHostKeyChecking=yes ) +SCP_OPTS=( + -i "$SSH_KEY" + -P "$BACKUP_REMOTE_SSH_PORT" + -o IdentitiesOnly=yes + -o BatchMode=yes + -o ConnectTimeout="$SSH_CONNECT_TIMEOUT" + -o StrictHostKeyChecking=yes +) + REMOTE_SSH="${BACKUP_REMOTE_USER}@${BACKUP_REMOTE_HOST}" read -r -a DBS_ARRAY <<< "$DBS"