kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-12-03 07:59:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor reachability checks for Matomo and Mailu

Browse Source 
- Replace status_code [200,301,302] with explicit 'status_code: 200'
- Use '(status | default(0) | int) != 200' for consistent reachability detection
- Remove deprecated Jinja usage inside when-conditions
- Replace string-rendered conditions with native boolean checks
- Improve Mailu routine trigger logic by tightening status evaluation
- Cleanup unused no_log directives

Reference: https://chatgpt.com/share/692f04b5-5698-800f-a355-9e9b70cf97d7
This commit is contained in:
Kevin Veen-Birkenbach
2025-12-02 16:25:21 +01:00
parent 4b5ba892ba
commit 48cd7743b5
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/sys-front-inj-all/tasks/01_dependencies.yml
View File

@@ -5,11 +5,10 @@
url: "{{ domains | get_url('web-app-matomo', WEB_PROTOCOL) }}" url: "{{ domains | get_url('web-app-matomo', WEB_PROTOCOL) }}"
method: HEAD method: HEAD
validate_certs: yes validate_certs: yes
status_code: [200, 301, 302] status_code: 200
register: matomo_reachability register: matomo_reachability
failed_when: false failed_when: false
changed_when: false changed_when: false
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}"
when: when:
- application_id != 'web-app-matomo' - application_id != 'web-app-matomo'
- run_once_web_app_matomo is not defined - run_once_web_app_matomo is not defined
@@ -20,7 +19,7 @@
public: false public: false
when: when:
- matomo_reachability is defined - matomo_reachability is defined
- matomo_reachability.status | default(0) not in [200, 301, 302] - (matomo_reachability.status | default(0) | int) != 200
# Matomo can't use this dependencies - At least not on the initial setup run # Matomo can't use this dependencies - At least not on the initial setup run
- when: - when:

13
roles/sys-svc-msmtp/tasks/01_core.yml
View File

@@ -2,18 +2,17 @@
- name: "Check if Mail Host is reachable" - name: "Check if Mail Host is reachable"
uri: uri:
url: "{{ WEB_PROTOCOL ~ '://' ~ SYSTEM_EMAIL.HOST }}" url: "{{ WEB_PROTOCOL }}://{{ SYSTEM_EMAIL.HOST }}"
method: HEAD method: HEAD
validate_certs: yes validate_certs: yes
status_code: [200, 301, 302] status_code: 200
register: mail_host_reachability register: mail_host_reachability
failed_when: false failed_when: false
changed_when: false changed_when: false
no_log: "{{ MASK_CREDENTIALS_IN_LOGS | bool }}" when:
when:
- run_once_web_app_mailu is not defined - run_once_web_app_mailu is not defined
- "{{ 'web-app-mailu' in group_names }}" - "'web-app-mailu' in group_names"
- SYSTEM_EMAIL.HOST == domains | get_domain('web-app-mailu') - SYSTEM_EMAIL.HOST == (domains | get_domain('web-app-mailu'))
- name: "Load Mailu Routines for '{{ role_name }}'" - name: "Load Mailu Routines for '{{ role_name }}'"
include_tasks: 02_mailu.yml include_tasks: 02_mailu.yml
@@ -21,7 +20,7 @@
- "'web-app-mailu' in group_names" - "'web-app-mailu' in group_names"
- > - >
(mail_host_reachability is defined and (mail_host_reachability is defined and
(mail_host_reachability.status | default(0)) not in [200, 301, 302]) (mail_host_reachability.status | default(0) | int) != 200)
or or
not (users['no-reply'].mailu_token | default(false) | bool) not (users['no-reply'].mailu_token | default(false) | bool)