Authelia: Move Legacy Redis container removal to Authelia tasks

saltyorg · Jan 5, 2024 · 0e65379 · 0e65379
1 parent 2bd4c26
commit 0e65379
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/roles/authelia/tasks/main.yml b/roles/authelia/tasks/main.yml
@@ -55,6 +55,14 @@
 - name: Authentication Backend Task
   ansible.builtin.import_tasks: "subtasks/auth_backend.yml"
 
+- name: Remove legacy Redis Docker container
+  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"
+  vars:
+    var_prefix: "{{ item }}"
+  loop:
+    - "authelia_redis"
+    - "redis"
+
 - name: "Import Redis Role"
   ansible.builtin.include_role:
     name: redis

diff --git a/roles/redis/tasks/main2.yml b/roles/redis/tasks/main2.yml
@@ -10,17 +10,6 @@
 - name: Remove existing Docker container
   ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"
 
-- name: Remove legacy Docker container
-  ansible.builtin.include_tasks: "{{ resources_tasks_path }}/docker/remove_docker_container.yml"
-  vars:
-    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:
     path: "{{ redis_paths_location }}"