From a056e6be9e72173b3f9d47642b367211fc584672 Mon Sep 17 00:00:00 2001 From: Kyattsukuro Date: Fri, 9 Oct 2026 23:16:47 +0200 Subject: [PATCH] working: ansible --- handlers/main.yml | 15 +++++++-------- meta/main.yml | 4 ++-- tasks/main.yml | 5 ++--- templates/compose.yml.j2 | 2 +- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/handlers/main.yml b/handlers/main.yml index 6fd3d12..4840418 100644 --- a/handlers/main.yml +++ b/handlers/main.yml @@ -1,9 +1,8 @@ - name: restart container -community.docker.docker_compose_v2: - project_src: "{{ path }}" - project_name: "{{ role_name }}" - recreate: "always" - services: ["vaultwarden"] - state: "restarted" -when: not _vaultwarden_already_restarted - + community.docker.docker_compose_v2: + project_src: "{{ path }}" + project_name: "{{ role_name }}" + recreate: "always" + services: ["vaultwarden"] + state: "restarted" + when: not _vaultwarden_already_restarted diff --git a/meta/main.yml b/meta/main.yml index 3384676..dbaa51b 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -16,5 +16,5 @@ galaxy_info: # NOTE: A tag is limited to a single word comprised of alphanumeric characters. # Maximum 20 tags per role. -# dependencies: -# - role: base +dependencies: + - role: traefik diff --git a/tasks/main.yml b/tasks/main.yml index 97a0bbf..2440c32 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -21,11 +21,10 @@ - name: template docker-compose template: - src: compose.yaml.j2 - dest: "{{ path }}/compose.yaml" + src: compose.yml.j2 + dest: "{{ path }}/compose.yml" notify: restart container - - name: ensure containers are running community.docker.docker_compose_v2: project_src: "{{ path }}" diff --git a/templates/compose.yml.j2 b/templates/compose.yml.j2 index 2f61afe..37b36fc 100644 --- a/templates/compose.yml.j2 +++ b/templates/compose.yml.j2 @@ -7,7 +7,7 @@ services: DOMAIN: "https://{{ vaultwarden.url }}" ADMIN_TOKEN: "{{ vaultwarden_admin_token_hash.stdout | replace('$', '$$') }}" - {% if vaultwarden.oidc.enabled -%} + {% if vaultwarden.oidc.issuer | length >= 1 -%} SSO_ENABLED: "true" SSO_PKCE: "true" SSO_AUTHORITY: "{{ vaultwarden.oidc.issuer }}"