diff --git a/.ansible-lint b/.ansible-lint index f7c8aa6..548eab6 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -8,5 +8,7 @@ loop_var_prefix: "^(__|{role}_)" exclude_paths: - .github/ - .ansible/ - # ansible-lint thinks it's a playbook so gives an error, but its tasks are for include_task. decided to exclude it + + # ansible-lint thinks they're playbooks so gives errors, but they're not - roles/rustdesk/molecule/default/client-binary-existance.yml + - roles/borg_server/molecule/default/secrets.yaml diff --git a/roles/borg_server/defaults/main.yml b/roles/borg_server/defaults/main.yml index c0ca809..aea7bf7 100644 --- a/roles/borg_server/defaults/main.yml +++ b/roles/borg_server/defaults/main.yml @@ -1,2 +1,2 @@ --- -hide_logs: true +borg_server_hide_logs: true diff --git a/roles/borg_server/meta/main.yml b/roles/borg_server/meta/main.yml index ed35ff2..2d9eacc 100644 --- a/roles/borg_server/meta/main.yml +++ b/roles/borg_server/meta/main.yml @@ -1,6 +1,6 @@ --- galaxy_info: - role_name: "ansible_borg_server" + role_name: "borg_server" namespace: genlab author: "Alexander Gorelyshev" company: "Genlab, LLC" @@ -10,8 +10,8 @@ galaxy_info: platforms: - name: "Ubuntu" - versions: [ "focal", "jammy" ] + versions: ["jammy", "noble"] - galaxy_tags: [ ] + galaxy_tags: [] dependencies: [] diff --git a/roles/borg_server/molecule/default/converge.yml b/roles/borg_server/molecule/default/converge.yml index 660e2c2..f525799 100644 --- a/roles/borg_server/molecule/default/converge.yml +++ b/roles/borg_server/molecule/default/converge.yml @@ -2,6 +2,6 @@ - name: Converge hosts: all roles: - - role: genlab.common.ansible_borg_server + - role: genlab.common.borg_server borg_secrets_path: "secrets.yaml" - hide_logs: false + borg_server_hide_logs: false diff --git a/roles/borg_server/molecule/default/verify.yml b/roles/borg_server/molecule/default/verify.yml index 21a9d83..ada7def 100644 --- a/roles/borg_server/molecule/default/verify.yml +++ b/roles/borg_server/molecule/default/verify.yml @@ -6,6 +6,6 @@ tasks: - name: "Check if `borg` is available from PATH" # noqa: no-changed-when - register: br_test__borg_version + register: borg_server_version ansible.builtin.command: cmd: "borg --version" diff --git a/roles/borg_server/tasks/main.yml b/roles/borg_server/tasks/main.yml index fd734be..47d75d6 100644 --- a/roles/borg_server/tasks/main.yml +++ b/roles/borg_server/tasks/main.yml @@ -17,7 +17,7 @@ state: present - name: "Create Borg users" - no_log: "{{ hide_logs }}" + no_log: "{{ borg_server_hide_logs }}" loop: "{{ borg_repos }}" ansible.builtin.user: name: "{{ item.user }}" @@ -26,11 +26,11 @@ create_home: true shell: "/bin/bash" generate_ssh_key: true - groups: [ borgs ] + groups: [borgs] append: true - name: "Configure SSH authorized keys for Borg users" - no_log: "{{ hide_logs }}" + no_log: "{{ borg_server_hide_logs }}" loop: "{{ borg_repos }}" ansible.builtin.lineinfile: path: /home/{{ item.user }}/.ssh/authorized_keys @@ -52,7 +52,7 @@ mode: "0770" - name: "Create repository folders" - no_log: "{{ hide_logs }}" + no_log: "{{ borg_server_hide_logs }}" loop: "{{ borg_repos }}" ansible.builtin.file: path: "{{ borg_repo_root }}/{{ item.name }}"