From 2bd4c2626cfd032b3b09592578a6e8eae59a854a Mon Sep 17 00:00:00 2001 From: owine Date: Fri, 5 Jan 2024 10:05:18 -0600 Subject: [PATCH] Authelia: Fix redis hostname --- roles/authelia/tasks/main.yml | 2 +- roles/authelia/tasks/subtasks/settings.yml | 4 ++-- roles/authelia/templates/configuration.yml.j2 | 2 +- roles/redis/tasks/main2.yml | 9 +++++++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/roles/authelia/tasks/main.yml b/roles/authelia/tasks/main.yml index 6cb988af70..b5ca8e5a76 100644 --- a/roles/authelia/tasks/main.yml +++ b/roles/authelia/tasks/main.yml @@ -59,7 +59,7 @@ ansible.builtin.include_role: name: redis vars: - redis_instances: ["authelia_redis"] + redis_instances: ["authelia-redis"] - name: Add DNS record ansible.builtin.include_tasks: "{{ resources_tasks_path }}/dns/tasker.yml" diff --git a/roles/authelia/tasks/subtasks/settings.yml b/roles/authelia/tasks/subtasks/settings.yml index 214c4904ec..9b1c4f822a 100644 --- a/roles/authelia/tasks/subtasks/settings.yml +++ b/roles/authelia/tasks/subtasks/settings.yml @@ -26,7 +26,7 @@ - name: Settings | Change session.redis.host value to 'authelia_redis' ansible.builtin.shell: | - yyq e -i '.session.redis.host = "authelia_redis"' {{ authelia_paths_location }}/configuration.yml + yyq e -i '.session.redis.host = "authelia-redis"' {{ authelia_paths_location }}/configuration.yml become: true become_user: "{{ user.name }}" - when: authelia_session_redis_host.stdout == "redis" + when: (authelia_session_redis_host.stdout == "redis") or (authelia_session_redis_host.stdout == "authelia_redis") diff --git a/roles/authelia/templates/configuration.yml.j2 b/roles/authelia/templates/configuration.yml.j2 index 5fa185b110..fa883d47c7 100644 --- a/roles/authelia/templates/configuration.yml.j2 +++ b/roles/authelia/templates/configuration.yml.j2 @@ -136,7 +136,7 @@ session: same_site: lax domain: {{ user.domain | lower }} redis: - host: authelia_redis + host: authelia-redis port: 6379 regulation: diff --git a/roles/redis/tasks/main2.yml b/roles/redis/tasks/main2.yml index c5e4e059b0..f80b058a93 100644 --- a/roles/redis/tasks/main2.yml +++ b/roles/redis/tasks/main2.yml @@ -13,8 +13,13 @@ - name: Remove legacy Docker container ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml" vars: - var_prefix: "redis" - when: (redis_name == "authelia_redis") + var_prefix: "{{ item }}" + when: (redis_name == "authelia-redis") + with_items: + - "authelia_redis" + - "redis" + loop_control: + loop_var: item - name: Reset Redis directory ansible.builtin.file: