diff --git a/playbooks/setup-restic.yml b/playbooks/setup-restic.yml index 989dddd..84881a5 100644 --- a/playbooks/setup-restic.yml +++ b/playbooks/setup-restic.yml @@ -166,12 +166,47 @@ group: users mode: '0755' - - name: Add known host entry for misamisa - shell: "ssh-keyscan -p 25456 -H misamisa.duckdns.org >> ~/.ssh/known_hosts" - register: keyscan - until: keyscan.rc == 0 - retries: 5 - delay: 10 + - name: Ensure known_hosts contains misamisa.duckdns.org on port 25456 + become: yes + vars: + host: "misamisa.duckdns.org" + port: 25456 + user_dir: "/root" # change if the playbook runs as a different user + + block: + + - name: Try to fetch key + shell: > + ssh-keyscan -p {{ port }} -H {{ host }} + >> {{ user_dir }}/.ssh/known_hosts + register: scan_result + ignore_errors: yes # we’ll decide later if it’s a real failure + + - name: Verify the key is now in known_hosts + shell: grep -Fq "{{ host }}" {{ user_dir }}/.ssh/known_hosts + register: verify_result + changed_when: False + failed_when: verify_result.rc != 0 + + rescue: + # If we get here, either ssh-keyscan failed or the key wasn’t added. + # Retry a few times before giving up. + - name: Retry fetching the key until it appears + shell: > + ssh-keyscan -p {{ port }} -H {{ host }} + >> {{ user_dir }}/.ssh/known_hosts + register: retry_result + retries: 5 + delay: 30 + until: retry_result.rc == 0 and + (shell("grep -Fq '{{ host }}' {{ user_dir }}/.ssh/known_hosts; echo $?") | int) == 0 + + - name: Final check – fail if key still missing + shell: grep -Fq "{{ host }}" {{ user_dir }}/.ssh/known_hosts + register: final_check + changed_when: False + failed_when: final_check.rc != 0 + - name: Download restic bz2 file get_url: