From 1082caddae3ddeeba6e218faa4882f200104dd90 Mon Sep 17 00:00:00 2001
From: Kevin Veen-Birkenbach <kevin@veen.world>
Date: Tue, 19 Aug 2025 10:22:38 +0200
Subject: [PATCH] refactor(sys-ctl-alm-compose, sys-timer-cln-bkps): - update
 alarm compose unit to run email/telegram notifiers independently via multiple
 ExecStart lines - ensure cleanup backup dependencies are included before
 timer setup with handler flush conversation:
 https://chatgpt.com/share/68a43429-c0cc-800f-9cc9-9a5ae258dc50

---
 .../templates/systemctl@.service.j2                |  6 ++++--
 roles/sys-timer-cln-bkps/tasks/01_core.yml         | 14 ++++++++------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/roles/sys-ctl-alm-compose/templates/systemctl@.service.j2 b/roles/sys-ctl-alm-compose/templates/systemctl@.service.j2
index cc59ca92..529c3fd1 100644
--- a/roles/sys-ctl-alm-compose/templates/systemctl@.service.j2
+++ b/roles/sys-ctl-alm-compose/templates/systemctl@.service.j2
@@ -1,8 +1,10 @@
 [Unit]
-Description=Notifier for %i
+Description={{ SOFTWARE_NAME }} - Alarm Notifier for %i
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/systemctl start {{ SYS_SERVICE_ON_FAILURE_EMAIL }} {{ SYS_SERVICE_ON_FAILURE_TELEGRAM }}
+{% for alarm_service in [ SYS_SERVICE_ON_FAILURE_EMAIL, SYS_SERVICE_ON_FAILURE_TELEGRAM ] %}
+ExecStart=/usr/bin/systemctl start {{ alarm_service }}
+{% endfor %}
 User=root
 Group=systemd-journal
diff --git a/roles/sys-timer-cln-bkps/tasks/01_core.yml b/roles/sys-timer-cln-bkps/tasks/01_core.yml
index e6d0767a..48d26ce1 100644
--- a/roles/sys-timer-cln-bkps/tasks/01_core.yml
+++ b/roles/sys-timer-cln-bkps/tasks/01_core.yml
@@ -1,3 +1,11 @@
+- name: Include dependencies
+  include_role:
+    name: '{{ item }}'
+  loop:
+    - sys-ctl-cln-bkps
+  vars:
+    flush_handlers: true
+
 - name: set systemctl_timer_service to sys-ctl-cln-backups
   set_fact:
     systemctl_timer_service: "sys-ctl-cln-backups"
@@ -7,9 +15,3 @@
     name: sys-timer
   vars:
     systemctl_on_calendar: "{{ SYS_SCHEDULE_CLEANUP_BACKUPS }}"
-
-- name: Include dependencies
-  include_role:
-    name: '{{ item }}'
-  loop:
-  - sys-ctl-cln-bkps
\ No newline at end of file