From 0856c340c770eddd86e1beb885b4796985a140ac Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 19 Aug 2025 20:35:02 +0200 Subject: [PATCH] Removed unnecessary logic --- roles/sys-ctl-alm-compose/tasks/01_core.yml | 1 + roles/sys-ctl-alm-email/tasks/01_core.yml | 2 -- roles/sys-ctl-alm-email/templates/systemctl@.service.j2 | 8 -------- roles/sys-ctl-alm-telegram/tasks/01_core.yml | 2 -- .../sys-ctl-alm-telegram/templates/systemctl@.service.j2 | 8 -------- 5 files changed, 1 insertion(+), 20 deletions(-) delete mode 100644 roles/sys-ctl-alm-email/templates/systemctl@.service.j2 delete mode 100644 roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2 diff --git a/roles/sys-ctl-alm-compose/tasks/01_core.yml b/roles/sys-ctl-alm-compose/tasks/01_core.yml index 3bb5cf63..ddbb85e7 100644 --- a/roles/sys-ctl-alm-compose/tasks/01_core.yml +++ b/roles/sys-ctl-alm-compose/tasks/01_core.yml @@ -8,6 +8,7 @@ flush_handlers: true system_service_timer_enabled: false system_service_copy_files: true + system_service_tpl_exec_start: "{{ system_service_script_exec }} %I" - name: "Include core service for '{{ system_service_id }}'" include_role: diff --git a/roles/sys-ctl-alm-email/tasks/01_core.yml b/roles/sys-ctl-alm-email/tasks/01_core.yml index 7e8f33c0..493e26b2 100644 --- a/roles/sys-ctl-alm-email/tasks/01_core.yml +++ b/roles/sys-ctl-alm-email/tasks/01_core.yml @@ -6,7 +6,5 @@ - include_role: name: sys-service - vars: - system_service_copy_files: true diff --git a/roles/sys-ctl-alm-email/templates/systemctl@.service.j2 b/roles/sys-ctl-alm-email/templates/systemctl@.service.j2 deleted file mode 100644 index 6e44a9b4..00000000 --- a/roles/sys-ctl-alm-email/templates/systemctl@.service.j2 +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=status email for %i to user - -[Service] -Type=oneshot -ExecStart={{ system_service_script_exec }} %I -User=root -Group=systemd-journal diff --git a/roles/sys-ctl-alm-telegram/tasks/01_core.yml b/roles/sys-ctl-alm-telegram/tasks/01_core.yml index 4011acac..eac2da07 100644 --- a/roles/sys-ctl-alm-telegram/tasks/01_core.yml +++ b/roles/sys-ctl-alm-telegram/tasks/01_core.yml @@ -12,8 +12,6 @@ - include_role: name: sys-service - vars: - system_service_copy_files: true - name: install curl community.general.pacman: diff --git a/roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2 b/roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2 deleted file mode 100644 index 87be18c8..00000000 --- a/roles/sys-ctl-alm-telegram/templates/systemctl@.service.j2 +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=status Telegram message for %i to user - -[Service] -Type=oneshot -ExecStart={{ system_service_script_exec }} %I -User=root -Group=systemd-journal