bypasses tasks not relevent to docker install method
This commit is contained in:
parent
d9dfd5c6b5
commit
d8c51011e7
@ -19,6 +19,7 @@
|
|||||||
- "{{ ansible_lsb.id }}.yml"
|
- "{{ ansible_lsb.id }}.yml"
|
||||||
|
|
||||||
- name: Install general dependencies (openssh)
|
- name: Install general dependencies (openssh)
|
||||||
|
when: borg_install_method != "docker"
|
||||||
ansible.builtin.package:
|
ansible.builtin.package:
|
||||||
name: "{{ borg_dep_packages }}"
|
name: "{{ borg_dep_packages }}"
|
||||||
state: present
|
state: present
|
||||||
|
@ -1,7 +1,11 @@
|
|||||||
---
|
---
|
||||||
# So in different positions in that role we need the user home
|
# So in different positions in that role we need the user home
|
||||||
# Since we cannot be sure that this FSH is compatible we will determine it.
|
# Since we cannot be sure that this FSH is compatible we will determine it.
|
||||||
- name: Get home dir
|
- name: User management
|
||||||
|
when:
|
||||||
|
- borg_install_method != "docker"
|
||||||
|
block:
|
||||||
|
- name: Get home dir
|
||||||
when:
|
when:
|
||||||
- borg_user == "root"
|
- borg_user == "root"
|
||||||
block:
|
block:
|
||||||
@ -17,7 +21,7 @@
|
|||||||
ansible.builtin.set_fact:
|
ansible.builtin.set_fact:
|
||||||
backup_user_info: "{{ user_info }}"
|
backup_user_info: "{{ user_info }}"
|
||||||
|
|
||||||
- name: Create user if borg_user != "root"
|
- name: Create user if borg_user != "root"
|
||||||
when:
|
when:
|
||||||
- borg_user != "root"
|
- borg_user != "root"
|
||||||
ansible.builtin.include_tasks:
|
ansible.builtin.include_tasks:
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
---
|
---
|
||||||
- name: Create SSH key (if neeeded) for {{ borg_user }}
|
- name: Create ssh key
|
||||||
|
when:
|
||||||
|
- borg_install_method != "docker"
|
||||||
|
block:
|
||||||
|
- name: Create SSH key (if needed) for {{ borg_user }}
|
||||||
block:
|
block:
|
||||||
- name: Ensure directory exist
|
- name: Ensure directory exist
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
@ -10,6 +14,7 @@
|
|||||||
group: "{{ borg_group }}"
|
group: "{{ borg_group }}"
|
||||||
|
|
||||||
- name: Generate an OpenSSH keypair
|
- name: Generate an OpenSSH keypair
|
||||||
|
when: not borg_ssh_private_key
|
||||||
community.crypto.openssh_keypair:
|
community.crypto.openssh_keypair:
|
||||||
path: "{{ borg_ssh_key_file_path }}"
|
path: "{{ borg_ssh_key_file_path }}"
|
||||||
mode: "0600"
|
mode: "0600"
|
||||||
@ -17,6 +22,23 @@
|
|||||||
owner: "{{ borg_user }}"
|
owner: "{{ borg_user }}"
|
||||||
group: "{{ borg_group }}"
|
group: "{{ borg_group }}"
|
||||||
|
|
||||||
|
- name: Generate public key from private key content # Also ensure priv key content is sound
|
||||||
|
when: borg_ssh_private_key
|
||||||
|
delegate_to: localhost
|
||||||
|
community.crypto.openssl_publickey:
|
||||||
|
path: "{{ borg_ssh_key_file_path }}.pub"
|
||||||
|
privatekey_content: "{{ borg_ssh_private_key }}"
|
||||||
|
register: public_key
|
||||||
|
|
||||||
|
- name: Copy provided OpenSSH private key
|
||||||
|
when: public_key.succeeded
|
||||||
|
ansible.builtin.copy:
|
||||||
|
content: "{{ borg_ssh_private_key }}"
|
||||||
|
dest: "{{ borg_ssh_key_file_path }}"
|
||||||
|
mode: "0600"
|
||||||
|
owner: "{{ borg_user }}"
|
||||||
|
group: "{{ borg_group }}"
|
||||||
|
|
||||||
- name: Read SSH key
|
- name: Read SSH key
|
||||||
ansible.builtin.slurp:
|
ansible.builtin.slurp:
|
||||||
src: "{{ borg_ssh_key_file_path }}.pub"
|
src: "{{ borg_ssh_key_file_path }}.pub"
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
---
|
---
|
||||||
- name: Add Borgmatic config file
|
- name: Add Borgmatic config file
|
||||||
|
when:
|
||||||
|
- borg_install_method != "docker"
|
||||||
block:
|
block:
|
||||||
- name: Ensure /etc/borgmatic exists
|
- name: Ensure /etc/borgmatic exists
|
||||||
ansible.builtin.file:
|
ansible.builtin.file:
|
||||||
|
@ -2,6 +2,7 @@
|
|||||||
- name: Install timer to run Borgmatic
|
- name: Install timer to run Borgmatic
|
||||||
when:
|
when:
|
||||||
- borgmatic_timer is defined and borgmatic_timer | length > 0
|
- borgmatic_timer is defined and borgmatic_timer | length > 0
|
||||||
|
- borg_install_method != "docker"
|
||||||
block:
|
block:
|
||||||
- name: Start timer install script
|
- name: Start timer install script
|
||||||
ansible.builtin.include_tasks:
|
ansible.builtin.include_tasks:
|
||||||
|
Loading…
Reference in New Issue
Block a user