diff --git a/ansible.cfg b/ansible.cfg index 5f42fc7..a1809cb 100644 --- a/ansible.cfg +++ b/ansible.cfg @@ -1,5 +1,5 @@ [defaults] -roles_path=~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles:roles +roles_path=~/.ansible/roles:roles:/usr/share/ansible/roles:/etc/ansible/roles inventory=inventory vault_password_file=util/secret-service-client.sh interpreter_python=/usr/bin/python3 diff --git a/inventory/host_vars/lewis.yml b/inventory/host_vars/lewis.yml index 2bbbeae..921c952 100644 --- a/inventory/host_vars/lewis.yml +++ b/inventory/host_vars/lewis.yml @@ -1,5 +1,5 @@ -kingston1tb_mount_point: "/mnt/kingston1TB" -kingston1tb_uuid: "622a8d81-aa2f-460b-a563-c3cdb6285609" +backup_mount_point: "/mnt/backups" +backup_uuid: "622a8d81-aa2f-460b-a563-c3cdb6285609" admin_public_keys: - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINUZp4BCxf7uLa1QWonx/Crf8tYZ5MKIZ+EuaBa82LrV user@user-laptop" @@ -20,3 +20,5 @@ deploy_ssh_certificates: key_type: ed25519 signing_key: hyp_host host: lewis.hyp + +docker_repository: ubuntu diff --git a/lewis.yml b/lewis.yml index ecf9bd1..811c58b 100644 --- a/lewis.yml +++ b/lewis.yml @@ -26,24 +26,24 @@ - name: Ensure backup directory exists file: - path: "{{ kingston1tb_mount_point }}/hosts" + path: "{{ backup_mount_point }}/hosts" state: directory - name: Create backup respositories command: - cmd: "borg init -e none {{ kingston1tb_mount_point }}/hosts/{{ item }}" - creates: "{{ kingston1tb_mount_point }}/hosts/{{ item }}" + cmd: "borg init -e none {{ backup_mount_point }}/hosts/{{ item }}" + creates: "{{ backup_mount_point }}/hosts/{{ item }}" with_items: "{{ backup_hosts }}" - name: Create extra disk moint point file: - path: "{{ kingston1tb_mount_point }}" + path: "{{ backup_mount_point }}" state: directory - name: Mount extra disk - ansible.posix.mount: - path: "{{ kingston1tb_mount_point }}" - src: "UUID={{ kingston1tb_uuid }}" + mount: + path: "{{ backup_mount_point }}" + src: "UUID={{ backup_uuid }}" fstype: ext4 passno: 1 state: present @@ -51,3 +51,6 @@ roles: - {role: apt, tags: apt} - {role: deploy_ssh_certificates, tags: deploy_ssh_certificates} + # - {role: docker, tags: docker} + # - {role: uptime_kuma, tags: uptime_kuma} + # - {role: alerts, tags: alerts} diff --git a/requirements.yml b/requirements.yml index 7dec18d..6820be1 100644 --- a/requirements.yml +++ b/requirements.yml @@ -4,3 +4,6 @@ - name: deploy_ssh_certificates src: https://git.pim.kunis.nl/home/ansible-role-deploy-ssh-certificates scm: git +- name: docker + src: https://git.pim.kunis.nl/pim/ansible-role-docker + scm: git