diff --git a/host_vars/u236610.your-storagebox.de b/host_vars/u236610.your-storagebox.de deleted file mode 100644 index e2e90e4d..00000000 --- a/host_vars/u236610.your-storagebox.de +++ /dev/null @@ -1,2 +0,0 @@ ---- -ansible_ssh_user: "{{ hetzner_storagebox_username }}" diff --git a/playbooks/hetzner_storagebox.yml b/playbooks/hetzner_storagebox.yml index fd624664..10cc7d29 100644 --- a/playbooks/hetzner_storagebox.yml +++ b/playbooks/hetzner_storagebox.yml @@ -1,7 +1,14 @@ --- - name: setup Hetzner storagebox account - hosts: u236610.your-storagebox.de + hosts: localhost gather_facts: false roles: - - { role: hetzner_storagebox, backup_dir: "backup", backup_clients: "{{ groups['borg_clients'] }}", tags: ["borg"] } + - role: hetzner_storagebox + backup_clients: "{{ groups['borg_clients'] }}" + backup_dir: backup + storagebox_id: "{{ hetzner_storagebox_id }}" + storagebox_hostname: "{{ hetzner_storagebox_username }}.your-storagebox.de" + storagebox_username: "{{ hetzner_storagebox_username }}" + storagebox_password: "{{ hetzner_storagebox_password }}" + tags: ["borg"] diff --git a/roles/hetzner_storagebox/tasks/main.yml b/roles/hetzner_storagebox/tasks/main.yml index d1e1d382..66649bff 100644 --- a/roles/hetzner_storagebox/tasks/main.yml +++ b/roles/hetzner_storagebox/tasks/main.yml @@ -1,21 +1,23 @@ --- -# We have to set up the Hetzner Storagebox account in a weird fashion because -# they don't even allow direct SSH. +# This role runs on localhost; use commands like sftp to upload configuration + - name: create the root backup directory at {{ backup_dir }} expect: - command: bash -c "echo 'mkdir {{ backup_dir }}' | sftp -P 23 {{ hetzner_storagebox_username }}@{{ inventory_hostname }}" + command: bash -c "echo 'mkdir {{ backup_dir }}' | sftp -P 23 {{ storagebox_username }}@{{ storagebox_hostname }}" responses: - (?i)password: "{{ hetzner_storagebox_password }}" - delegate_to: localhost + (?i)password: "{{ storagebox_password }}" - name: create a home directory for each sub-account expect: - command: bash -c "echo 'mkdir {{ backup_dir }}/{{ item }}' | sftp -P 23 {{ hetzner_storagebox_username }}@{{ inventory_hostname }}" + command: | + bash -c 'sftp -P 23 {{ storagebox_username }}@{{ storagebox_hostname }} <