diff --git a/roles/authentik/tasks/main.yml b/roles/authentik/tasks/main.yml index 1471836..38d7d95 100644 --- a/roles/authentik/tasks/main.yml +++ b/roles/authentik/tasks/main.yml @@ -2,18 +2,41 @@ --- # tasks file for authentik -- name: Create authentik directories +- name: Create docker compose directory file: - path: "{{ item }}" + path: "{{ authentik_docker_compose_dir }}" + state: directory + mode: '0755' + +- name: Create authentik data directory + file: + path: "{{ authentik_docker_volume_dir }}/data" + state: directory + mode: '0755' + +- name: Create authentik certs directory + file: + path: "{{ authentik_docker_volume_dir }}/certs" + state: directory + mode: '0755' + +- name: Create authentik templates directory + file: + path: "{{ authentik_docker_volume_dir }}/templates" + state: directory + mode: '0755' + +- name: Create postgres data directory + file: + path: "{{ authentik_docker_volume_dir }}/postgresql" + state: directory + mode: '0755' + +- name: Create blueprints directory + file: + path: "{{ authentik_docker_volume_dir }}/blueprints" state: directory mode: '0755' - loop: - - "{{ authentik_docker_compose_dir }}" - - "{{ authentik_docker_volume_dir }}/data" - - "{{ authentik_docker_volume_dir }}/certs" - - "{{ authentik_docker_volume_dir }}/templates" - - "{{ authentik_docker_volume_dir }}/postgresql" - - "{{ authentik_docker_volume_dir }}/blueprints" - name: Create docker-compose file for authentik template: @@ -47,7 +70,6 @@ retries: 30 delay: 10 until: blueprint_wait_result.rc == 0 - when: blueprints_changed - name: Render LDAP outpost token script template: @@ -55,7 +77,6 @@ dest: "{{ authentik_docker_volume_dir }}/data/set-outpost-token.py" mode: '0644' when: authentik_ldap_outpost.name is defined - register: ldap_token_script - name: Set known token for LDAP outpost community.docker.docker_compose_v2_exec: @@ -67,4 +88,4 @@ retries: 30 delay: 10 until: ldap_token_result.rc == 0 - when: authentik_ldap_outpost.name is defined and (blueprints_changed or ldap_token_script.changed) \ No newline at end of file + when: authentik_ldap_outpost.name is defined \ No newline at end of file diff --git a/roles/authentik_outpost_ldap/tasks/main.yml b/roles/authentik_outpost_ldap/tasks/main.yml index 79a350a..7d58beb 100644 --- a/roles/authentik_outpost_ldap/tasks/main.yml +++ b/roles/authentik_outpost_ldap/tasks/main.yml @@ -23,6 +23,7 @@ community.docker.docker_compose_v2: project_src: "{{ authentik_outpost_ldap_docker_compose_dir }}" state: present + recreate: always wait: true wait_timeout: 120 retries: 3 diff --git a/roles/opencloud/templates/docker-compose.yml.j2 b/roles/opencloud/templates/docker-compose.yml.j2 index b731526..7fafb2f 100644 --- a/roles/opencloud/templates/docker-compose.yml.j2 +++ b/roles/opencloud/templates/docker-compose.yml.j2 @@ -103,7 +103,7 @@ services: {% endif %} networks: - {{ opencloud_traefik_network }} -{% for net in opencloud_extra_networks %} + {% for net in opencloud_extra_networks %} - {{ net }} {% endfor %} {% if opencloud_extra_hosts is defined and opencloud_extra_hosts | length > 0 %}