diff --git a/.github/workflows/general.yml b/.github/workflows/general.yml index 15a2fbc..1860b14 100644 --- a/.github/workflows/general.yml +++ b/.github/workflows/general.yml @@ -20,7 +20,7 @@ jobs: uses: actions/checkout@v4 - name: Role linting - uses: actionhippie/ansible-later@v2 + uses: actionhippie/ansible-later@v3 testing: runs-on: ubuntu-latest diff --git a/handlers/main.yml b/handlers/main.yml index babcd13..ff3f457 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,12 +1,12 @@ --- - name: Restart traefik - systemd: + ansible.builtin.systemd: name: traefik state: restarted daemon_reload: True - name: Reload traefik - systemd: + ansible.builtin.systemd: name: traefik state: '{{ "restarted" if traefik_force_restart else "reloaded" }}' daemon_reload: True diff --git a/meta/requirements.yml b/meta/requirements.yml new file mode 100644 index 0000000..a7dcead --- /dev/null +++ b/meta/requirements.yml @@ -0,0 +1,8 @@ +--- +collections: + - community.docker + +roles: + - name: rolehippie.docker + +... diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml index 113c1b0..2b6e8c7 100644 --- a/molecule/default/prepare.yml +++ b/molecule/default/prepare.yml @@ -4,22 +4,48 @@ gather_facts: False tasks: + - name: Stat apt dir + register: aptdir + ansible.builtin.stat: + path: /var/lib/apt + - name: Wait for aptlock - shell: while fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do echo 'Waiting for apt list lock.' && sleep 10; done + when: aptdir.stat.exists changed_when: False + ansible.builtin.shell: + cmd: while fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do echo 'Waiting for apt list lock.' && sleep 10; done - name: Update package cache - apt: + when: aptdir.stat.exists + ansible.builtin.apt: update_cache: True - - name: Install gpg dependency - apt: - name: python3-gpg + - name: Install test dependencies + when: aptdir.stat.exists + loop: + - python3-gpg + - curl + ansible.builtin.apt: + name: "{{ item }}" state: present - - name: Install curl dependency - apt: - name: curl - state: present + - name: Create man dirs + changed_when: False + loop: + - /usr/share/man/man1 + - /usr/share/man/man2 + - /usr/share/man/man3 + - /usr/share/man/man4 + - /usr/share/man/man5 + - /usr/share/man/man6 + - /usr/share/man/man7 + - /usr/share/man/man8 + - /usr/share/man/man9 + ansible.builtin.file: + path: "{{ item }}" + owner: root + group: root + mode: u=rwx,g=rx,o=rx + state: directory ... diff --git a/molecule/requirements.yml b/molecule/requirements.yml index 01b34ae..a7dcead 100644 --- a/molecule/requirements.yml +++ b/molecule/requirements.yml @@ -1,5 +1,7 @@ --- -collections: [] +collections: + - community.docker + roles: - name: rolehippie.docker diff --git a/tasks/main.yml b/tasks/main.yml index d0b3652..a2b4201 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -2,7 +2,7 @@ - name: Create required dirs with_items: - /etc/traefik - file: + ansible.builtin.file: path: "{{ item }}" state: directory owner: root @@ -14,7 +14,7 @@ - name: Write general config notify: - Reload traefik - template: + ansible.builtin.template: src: config.j2 dest: /etc/traefik/traefik.yml owner: root @@ -26,7 +26,7 @@ - name: Write static config notify: - Reload traefik - template: + ansible.builtin.template: src: static.j2 dest: /etc/traefik/static.yml owner: root @@ -38,7 +38,7 @@ - name: Write env default notify: - Restart traefik - template: + ansible.builtin.template: src: default.j2 dest: /etc/default/traefik owner: root @@ -50,7 +50,7 @@ - name: Write service file notify: - Restart traefik - template: + ansible.builtin.template: src: service.j2 dest: /etc/systemd/system/traefik.service owner: root @@ -62,7 +62,7 @@ - name: Pull docker image when: - traefik_pull_image - docker_image: + community.docker.docker_image: name: "{{ traefik_image }}" source: pull tags: @@ -71,13 +71,13 @@ - name: Create docker network when: - traefik_network | default(False) - docker_network: + community.docker.docker_network: name: '{{ traefik_network }}' tags: - traefik - name: Start traefik service - systemd: + ansible.builtin.systemd: name: traefik state: started daemon_reload: True diff --git a/templates/config.j2 b/templates/config.j2 index c46440b..8509f88 100644 --- a/templates/config.j2 +++ b/templates/config.j2 @@ -58,7 +58,7 @@ providers: {% endif %} defaultRule: {{ traefik_docker_default_rule }} - file: + ansible.builtin.file: filename: /etc/traefik/static.yml watch: true {% if traefik_api_enabled %} @@ -66,7 +66,7 @@ providers: api: insecure: {{ traefik_api_insecure | lower }} dashboard: {{ traefik_api_dashboard | lower }} - debug: {{ traefik_api_debug | lower }} + ansible.builtin.debug: {{ traefik_api_debug | lower }} {% endif %} {% if traefik_prometheus_enabled %}