From 27c399123bcb781ba0d1449dbe2de51bbb6ae178 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 4 Dec 2025 00:53:27 +0100 Subject: [PATCH] Optimized handler loading. Requirerd due to 2.18->2.20 update --- roles/svc-db-postgres/tasks/main.yml | 2 +- roles/sys-front-inj-matomo/tasks/main.yml | 9 --------- roles/sys-service/tasks/main.yml | 2 +- roles/sys-stk-front-base/tasks/main.yml | 3 ++- roles/sys-stk-front-proxy/tasks/01_core.yml | 9 +++++---- roles/sys-stk-full-stateful/tasks/main.yml | 3 ++- .../tasks/remove_deprecated_nginx_configs.yml | 5 +++++ roles/sys-svc-docker/handlers/main.yml | 9 +++++++++ roles/sys-svc-letsencrypt/tasks/01_core.yml | 5 +++++ roles/sys-svc-msmtp/tasks/02_mailu.yml | 2 +- roles/sys-svc-webserver-core/tasks/01_core.yml | 2 +- roles/web-app-keycloak/tasks/01_meta.yml | 2 +- roles/web-svc-cdn/tasks/main.yml | 2 +- 13 files changed, 34 insertions(+), 21 deletions(-) diff --git a/roles/svc-db-postgres/tasks/main.yml b/roles/svc-db-postgres/tasks/main.yml index ca6b2710..23d8f502 100644 --- a/roles/svc-db-postgres/tasks/main.yml +++ b/roles/svc-db-postgres/tasks/main.yml @@ -1,7 +1,7 @@ - include_tasks: 01_core.yml when: run_once_svc_db_postgres is not defined -- include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" +- include_tasks: utils/load_handlers.yml # Necessary because docker handlers are overwritten by condition vars: handler_role_name: "docker-compose" diff --git a/roles/sys-front-inj-matomo/tasks/main.yml b/roles/sys-front-inj-matomo/tasks/main.yml index e7073c51..5cca6b08 100644 --- a/roles/sys-front-inj-matomo/tasks/main.yml +++ b/roles/sys-front-inj-matomo/tasks/main.yml @@ -1,14 +1,5 @@ # run_once_sys_front_inj_matomo: deactivated -- name: "Relevant variables for role: {{ role_path | basename }}" - debug: - msg: - domain: "{{ domain }}" - base_domain: "{{ base_domain }}" - matomo_verification_url: "{{ matomo_verification_url }}" - when: MODE_DEBUG | bool - no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}" - - name: "Check if site {{ domain }} is allready registered at Matomo" uri: url: "{{ matomo_verification_url }}" diff --git a/roles/sys-service/tasks/main.yml b/roles/sys-service/tasks/main.yml index 541b33cb..5f9e90bb 100644 --- a/roles/sys-service/tasks/main.yml +++ b/roles/sys-service/tasks/main.yml @@ -1,5 +1,5 @@ - name: "Reload sys-daemon handlers" - include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" + include_tasks: utils/load_handlers.yml vars: handler_role_name: "sys-daemon" when: run_once_sys_service is defined diff --git a/roles/sys-stk-front-base/tasks/main.yml b/roles/sys-stk-front-base/tasks/main.yml index 454cf8a0..352507a3 100644 --- a/roles/sys-stk-front-base/tasks/main.yml +++ b/roles/sys-stk-front-base/tasks/main.yml @@ -9,6 +9,7 @@ - include_tasks: "01_cloudflare.yml" when: DNS_PROVIDER == "cloudflare" -- include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" +- name: "Reinitialize OpenResty Handler" + include_tasks: utils/load_handlers.yml vars: handler_role_name: "svc-prx-openresty" diff --git a/roles/sys-stk-front-proxy/tasks/01_core.yml b/roles/sys-stk-front-proxy/tasks/01_core.yml index 8b8e6c49..780fbae5 100644 --- a/roles/sys-stk-front-proxy/tasks/01_core.yml +++ b/roles/sys-stk-front-proxy/tasks/01_core.yml @@ -1,7 +1,3 @@ -- include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" - vars: - handler_role_name: "svc-prx-openresty" - - name: Front bootstrap include_role: name: sys-stk-front-base @@ -10,6 +6,11 @@ include_role: name: sys-util-csp-cert +- name: "Reinitialize OpenResty Handler" + include_tasks: utils/load_handlers.yml + vars: + handler_role_name: "svc-prx-openresty" + - name: "Copy nginx config to '{{ front_proxy_domain_conf_dst }}'" template: src: "{{ item }}" diff --git a/roles/sys-stk-full-stateful/tasks/main.yml b/roles/sys-stk-full-stateful/tasks/main.yml index f3bd3bf6..c3ca648a 100644 --- a/roles/sys-stk-full-stateful/tasks/main.yml +++ b/roles/sys-stk-full-stateful/tasks/main.yml @@ -1,6 +1,7 @@ # run_once_sys_stk_full_stateful: deactivated -- include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" +- name: "Reinitialize OpenResty Handler" + include_tasks: utils/load_handlers.yml vars: handler_role_name: "svc-prx-openresty" diff --git a/roles/sys-svc-cln-domains/tasks/remove_deprecated_nginx_configs.yml b/roles/sys-svc-cln-domains/tasks/remove_deprecated_nginx_configs.yml index f5374cac..896a271a 100644 --- a/roles/sys-svc-cln-domains/tasks/remove_deprecated_nginx_configs.yml +++ b/roles/sys-svc-cln-domains/tasks/remove_deprecated_nginx_configs.yml @@ -5,6 +5,11 @@ patterns: "*.{{ domain }}.conf" register: find_result +- name: "Reinitialize OpenResty Handler" + include_tasks: utils/load_handlers.yml + vars: + handler_role_name: "svc-prx-openresty" + - name: Remove wildcard nginx configs for {{ domain }} ansible.builtin.file: path: "{{ item.path }}" diff --git a/roles/sys-svc-docker/handlers/main.yml b/roles/sys-svc-docker/handlers/main.yml index 0b16810a..78b8d686 100644 --- a/roles/sys-svc-docker/handlers/main.yml +++ b/roles/sys-svc-docker/handlers/main.yml @@ -5,3 +5,12 @@ state: restarted enabled: yes when: not (IS_CONTAINER | bool) + listen: docker restart + +- name: Ensure Docker daemon is running inside container + shell: docker info + register: docker_info + failed_when: docker_info.rc != 0 + changed_when: false + when: IS_CONTAINER | bool + listen: docker restart \ No newline at end of file diff --git a/roles/sys-svc-letsencrypt/tasks/01_core.yml b/roles/sys-svc-letsencrypt/tasks/01_core.yml index 7fba55f4..fdd10ad9 100644 --- a/roles/sys-svc-letsencrypt/tasks/01_core.yml +++ b/roles/sys-svc-letsencrypt/tasks/01_core.yml @@ -3,6 +3,11 @@ name: sys-ctl-mtn-cert-renew when: run_once_sys_ctl_mtn_cert_renew is not defined +- name: "Reinitialize OpenResty Handler" + include_tasks: utils/load_handlers.yml + vars: + handler_role_name: "svc-prx-openresty" + - name: create nginx letsencrypt config file template: src: "letsencrypt.conf.j2" diff --git a/roles/sys-svc-msmtp/tasks/02_mailu.yml b/roles/sys-svc-msmtp/tasks/02_mailu.yml index 759c36c6..a97b878b 100644 --- a/roles/sys-svc-msmtp/tasks/02_mailu.yml +++ b/roles/sys-svc-msmtp/tasks/02_mailu.yml @@ -4,6 +4,6 @@ load_app_id: web-app-mailu - name: "Reset compose handlers after Mailu include for MSMTP" - include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" + include_tasks: utils/load_handlers.yml vars: handler_role_name: "docker-compose" \ No newline at end of file diff --git a/roles/sys-svc-webserver-core/tasks/01_core.yml b/roles/sys-svc-webserver-core/tasks/01_core.yml index e4e97fef..8d270823 100644 --- a/roles/sys-svc-webserver-core/tasks/01_core.yml +++ b/roles/sys-svc-webserver-core/tasks/01_core.yml @@ -12,7 +12,7 @@ include_vars: "{{ DOCKER_VARS_FILE }}" - name: "Load docker compose & openresty handlers" - include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" + include_tasks: utils/load_handlers.yml loop: - docker-compose - svc-prx-openresty diff --git a/roles/web-app-keycloak/tasks/01_meta.yml b/roles/web-app-keycloak/tasks/01_meta.yml index b997ccea..99dc1c9d 100644 --- a/roles/web-app-keycloak/tasks/01_meta.yml +++ b/roles/web-app-keycloak/tasks/01_meta.yml @@ -1,4 +1,4 @@ -- include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" +- include_tasks: utils/load_handlers.yml vars: handler_role_name: "docker-compose" - ansible.builtin.include_vars: diff --git a/roles/web-svc-cdn/tasks/main.yml b/roles/web-svc-cdn/tasks/main.yml index b8a09072..831e8b7f 100644 --- a/roles/web-svc-cdn/tasks/main.yml +++ b/roles/web-svc-cdn/tasks/main.yml @@ -3,6 +3,6 @@ vars: application_id: 'web-svc-cdn' -- include_tasks: "{{ [ playbook_dir, 'tasks/utils/load_handlers.yml' ] | path_join }}" +- include_tasks: utils/load_handlers.yml vars: handler_role_name: "docker-compose"