From 73ec220847dadfbd15ad48a8270727a270b34ee0 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 4 Dec 2025 11:04:00 +0100 Subject: [PATCH] Added utils/load_handlers.yml required due to update 2.18 -> 2.20 --- roles/svc-prx-openresty/tasks/main.yml | 13 ++++++++++--- roles/sys-svc-rdbms/tasks/main.yml | 6 +++--- roles/sys-svc-webserver-core/tasks/01_core.yml | 12 ++++++++---- roles/sys-svc-webserver-core/tasks/main.yml | 6 ------ 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/roles/svc-prx-openresty/tasks/main.yml b/roles/svc-prx-openresty/tasks/main.yml index d869072a..229e737b 100644 --- a/roles/svc-prx-openresty/tasks/main.yml +++ b/roles/svc-prx-openresty/tasks/main.yml @@ -3,8 +3,15 @@ include_role: name: docker-compose vars: - docker_compose_flush_handlers: true docker_git_repository_pull: false # Deactivated here to deactivate inhirement - database_type: "" # Deactivate Database for openresty + database_type: "" # Deactivate Database for openresty + docker_compose_flush_handlers: true - include_tasks: utils/once/flag.yml - when: run_once_svc_prx_openresty is not defined \ No newline at end of file + when: run_once_svc_prx_openresty is not defined + +- name: "Reinitialize OpenResty Handler" + # The 'when: run_once_svc_prx_openresty is not defined' prevents otherwise + # the handler execution + include_tasks: utils/load_handlers.yml + vars: + handler_role_name: "svc-prx-openresty" diff --git a/roles/sys-svc-rdbms/tasks/main.yml b/roles/sys-svc-rdbms/tasks/main.yml index d412740e..2c45abe0 100644 --- a/roles/sys-svc-rdbms/tasks/main.yml +++ b/roles/sys-svc-rdbms/tasks/main.yml @@ -18,12 +18,12 @@ - name: "For '{{ application_id }}': Create central database" # I don't know why this includes leads to that the application_id in vars/main.yml of the database role isn't used # This is the behaviour which I want, but I'm still wondering why ;) - include_role: - name: "svc-db-{{ database_type }}" - when: SYS_SVC_RDBMS_CENTRAL_DB_ENABLED | bool + include_tasks: "utils/load_app.yml" vars: + load_app_id: "svc-db-{{ database_application_type }}" database_init: true # Initialize a custom database for the application docker_git_repository_pull: false # Deactivated here to don't inhire the variable + when: SYS_SVC_RDBMS_CENTRAL_DB_ENABLED | bool - name: "For '{{ application_id }}': Add Entry for Backup Procedure" include_tasks: "{{ playbook_dir }}/roles/sys-ctl-bkp-docker-2-loc/tasks/04_seed-database-to-backup.yml" diff --git a/roles/sys-svc-webserver-core/tasks/01_core.yml b/roles/sys-svc-webserver-core/tasks/01_core.yml index 23c8327f..1b5c7aac 100644 --- a/roles/sys-svc-webserver-core/tasks/01_core.yml +++ b/roles/sys-svc-webserver-core/tasks/01_core.yml @@ -14,11 +14,10 @@ - name: "Include tasks to create directories" include_tasks: 04_directories.yml -- name: Load OpenResty - include_tasks: "utils/load_app.yml" +- name: "Provide OpenResty Handlers for Webserver" + include_tasks: utils/load_handlers.yml vars: - load_app_id: svc-prx-openresty - docker_compose_flush_handlers: false # Prevent deploy until initial Config is created + handler_role_name: svc-prx-openresty - name: Deploy OpenResty NGINX Base Configuration template: @@ -26,6 +25,11 @@ dest: "{{ NGINX.FILES.CONFIGURATION }}" notify: restart openresty +- name: Load OpenResty + include_tasks: "utils/load_app.yml" + vars: + load_app_id: svc-prx-openresty + - name: Flush OpenResty Base Setup meta: flush_handlers diff --git a/roles/sys-svc-webserver-core/tasks/main.yml b/roles/sys-svc-webserver-core/tasks/main.yml index 6c50b64c..92620e21 100644 --- a/roles/sys-svc-webserver-core/tasks/main.yml +++ b/roles/sys-svc-webserver-core/tasks/main.yml @@ -1,9 +1,3 @@ --- - include_tasks: 01_core.yml when: run_once_sys_svc_webserver_core is not defined - -- name: "Provide OpenResty Handlers for Webserver" - include_tasks: utils/load_handlers.yml - vars: - handler_role_name: svc-prx-openresty - when: run_once_sys_svc_webserver_core is defined \ No newline at end of file