From 53770f5308870ce23bf70f320d39d7f222f9e456 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Wed, 13 Aug 2025 01:03:31 +0200
Subject: [PATCH] Optimized flush order to solve yourls oauth2 proxy bug

---
 roles/cmp-docker-oauth2/tasks/main.yml | 8 +++++++-
 roles/docker-compose/tasks/main.yml    | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/roles/cmp-docker-oauth2/tasks/main.yml b/roles/cmp-docker-oauth2/tasks/main.yml
index faee448b..9c481b88 100644
--- a/roles/cmp-docker-oauth2/tasks/main.yml
+++ b/roles/cmp-docker-oauth2/tasks/main.yml
@@ -3,6 +3,8 @@
 - name: "For '{{ application_id }}': Load docker-compose"
   include_role: 
     name: docker-compose
+  vars:
+    docker_compose_flush_handlers: false
 
 - block:
     - name: "set oauth2_proxy_application_id (Needed due to lazzy loading issue)"
@@ -10,4 +12,8 @@
         oauth2_proxy_application_id: "{{ application_id }}"
     - name: "include the web-app-oauth2-proxy role {{domain}}"
       include_tasks: "{{ playbook_dir }}/roles/web-app-oauth2-proxy/tasks/main.yml"
-  when: applications | get_app_conf(application_id, 'features.oauth2', False)
\ No newline at end of file
+  when: applications | get_app_conf(application_id, 'features.oauth2', False)
+
+- name: "flush docker compose and oauth2 proxy for '{{ application_id }}'"
+  meta: flush_handlers
+  when: docker_compose_flush_handlers | bool
\ No newline at end of file
diff --git a/roles/docker-compose/tasks/main.yml b/roles/docker-compose/tasks/main.yml
index 47127deb..661969a1 100644
--- a/roles/docker-compose/tasks/main.yml
+++ b/roles/docker-compose/tasks/main.yml
@@ -32,6 +32,6 @@
     include_tasks: "04_ensure_up.yml"
   when: not docker_compose_skipp_file_creation | bool
 
-- name: "flush database, docker and proxy for '{{ application_id }}'"
+- name: "flush docker compose for '{{ application_id }}'"
   meta: flush_handlers
   when: docker_compose_flush_handlers | bool