From 7ef20474a0091b77b4e77c7cdb0e7cd307fc2904 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Tue, 19 Aug 2025 12:15:33 +0200 Subject: [PATCH] Renamed sys-ctl-cln-backups to sys-ctl-cln-bkps --- group_vars/all/07_services.yml | 2 +- roles/sys-ctl-cln-bkps/tasks/main.yml | 3 ++- roles/sys-ctl-cln-bkps/templates/systemctl.service.j2 | 2 +- roles/sys-ctl-cln-disc-space/templates/script.sh.j2 | 2 +- roles/sys-timer-cln-bkps/README.md | 2 +- roles/sys-timer-cln-bkps/tasks/01_core.yml | 4 ++-- tests/unit/filter_plugins/test_get_service_name.py | 8 ++++---- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/group_vars/all/07_services.yml b/group_vars/all/07_services.yml index a9ff5f5b..2d5bf4ee 100644 --- a/group_vars/all/07_services.yml +++ b/group_vars/all/07_services.yml @@ -7,7 +7,7 @@ SYS_SERVICE_ALL_ENABLED: false # Flush all services SYS_SERVICE_DEFAULT_STATE: "{{ omit }}" ## Names -SYS_SERVICE_CLEANUP_BACKUPS_OLD: "{{ 'sys-ctl-cln-backups' | get_service_name(SOFTWARE_NAME) }}" +SYS_SERVICE_CLEANUP_BACKUPS_OLD: "{{ 'sys-ctl-cln-bkps' | get_service_name(SOFTWARE_NAME) }}" SYS_SERVICE_CLEANUP_BACKUPS_FAILED: "{{ 'sys-ctl-cln-faild-bkps' | get_service_name(SOFTWARE_NAME) }}" SYS_SERVICE_OPTIMIZE_DRIVE: "{{ 'svc-opt-ssd-hdd' | get_service_name(SOFTWARE_NAME) }}" SYS_SERVICE_BACKUP_RMT_2_LOC: "{{ 'svc-bkp-rmt-2-loc' | get_service_name(SOFTWARE_NAME) }}" diff --git a/roles/sys-ctl-cln-bkps/tasks/main.yml b/roles/sys-ctl-cln-bkps/tasks/main.yml index 5e38c7a2..0c53246c 100644 --- a/roles/sys-ctl-cln-bkps/tasks/main.yml +++ b/roles/sys-ctl-cln-bkps/tasks/main.yml @@ -1,5 +1,6 @@ - block: - include_tasks: 01_core.yml - include_tasks: utils/run_once.yml + vars: + flush_handlers: true when: run_once_sys_ctl_cln_bkps is not defined - diff --git a/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2 b/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2 index cc47795f..d6a34339 100644 --- a/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2 +++ b/roles/sys-ctl-cln-bkps/templates/systemctl.service.j2 @@ -4,5 +4,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} [Service] Type=oneshot -ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP| join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}" +ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_GROUP_CLEANUP | join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}" ExecStart={{ systemctl_script_exec }} --backups-folder-path {{ BACKUPS_FOLDER_PATH }} --maximum-backup-size-percent {{SIZE_PERCENT_MAXIMUM_BACKUP}} \ No newline at end of file diff --git a/roles/sys-ctl-cln-disc-space/templates/script.sh.j2 b/roles/sys-ctl-cln-disc-space/templates/script.sh.j2 index f4e07183..a9243574 100644 --- a/roles/sys-ctl-cln-disc-space/templates/script.sh.j2 +++ b/roles/sys-ctl-cln-disc-space/templates/script.sh.j2 @@ -24,7 +24,7 @@ if [ "$force_freeing" = true ]; then {% if BACKUPS_FOLDER_PATH is defined and SIZE_PERCENT_MAXIMUM_BACKUP is defined %} echo "cleaning up backups" && - python {{ 'sys-ctl-cln-backups' | get_service_script_path('sh') }} --backups-folder-path {{ BACKUPS_FOLDER_PATH }} --maximum-backup-size-percent {{ SIZE_PERCENT_MAXIMUM_BACKUP }} || exit 2 + python {{ 'sys-ctl-cln-bkps' | get_service_script_path('sh') }} --backups-folder-path {{ BACKUPS_FOLDER_PATH }} --maximum-backup-size-percent {{ SIZE_PERCENT_MAXIMUM_BACKUP }} || exit 2 {% endif %} if pacman -Qs $package > /dev/null ; then diff --git a/roles/sys-timer-cln-bkps/README.md b/roles/sys-timer-cln-bkps/README.md index 93c97af1..36325442 100644 --- a/roles/sys-timer-cln-bkps/README.md +++ b/roles/sys-timer-cln-bkps/README.md @@ -8,7 +8,7 @@ This role sets up a systemd timer to schedule the periodic cleanup of old backup Optimized for automated maintenance, this role: - Sets a fact for the service name. -- Integrates with the [sys-timer](../sys-timer/README.md) role to schedule sys-ctl-cln-backups tasks at defined intervals. +- Integrates with the [sys-timer](../sys-timer/README.md) role to schedule sys-ctl-cln-bkps tasks at defined intervals. ## Purpose diff --git a/roles/sys-timer-cln-bkps/tasks/01_core.yml b/roles/sys-timer-cln-bkps/tasks/01_core.yml index 48d26ce1..10a38a25 100644 --- a/roles/sys-timer-cln-bkps/tasks/01_core.yml +++ b/roles/sys-timer-cln-bkps/tasks/01_core.yml @@ -6,9 +6,9 @@ vars: flush_handlers: true -- name: set systemctl_timer_service to sys-ctl-cln-backups +- name: set systemctl_timer_service to sys-ctl-cln-bkps set_fact: - systemctl_timer_service: "sys-ctl-cln-backups" + systemctl_timer_service: "sys-ctl-cln-bkps" - name: "include role for sys-timer for {{ systemctl_timer_service }}" include_role: diff --git a/tests/unit/filter_plugins/test_get_service_name.py b/tests/unit/filter_plugins/test_get_service_name.py index 77d73449..45c5ab07 100644 --- a/tests/unit/filter_plugins/test_get_service_name.py +++ b/tests/unit/filter_plugins/test_get_service_name.py @@ -4,8 +4,8 @@ from filter_plugins import get_service_name class TestGetServiceName(unittest.TestCase): def test_default_suffix_service(self): self.assertEqual( - get_service_name.get_service_name("sys-ctl-cln-backups", "nginx"), - "sys-ctl-cln-backups.nginx.service" + get_service_name.get_service_name("sys-ctl-cln-bkps", "nginx"), + "sys-ctl-cln-bkps.nginx.service" ) def test_default_suffix(self): @@ -26,8 +26,8 @@ class TestGetServiceName(unittest.TestCase): "sys-ctl-bkp.postgres@" ) self.assertEqual( - get_service_name.get_service_name("sys-ctl-cln-backups", "nginx", False), - "sys-ctl-cln-backups.nginx" + get_service_name.get_service_name("sys-ctl-cln-bkps", "nginx", False), + "sys-ctl-cln-bkps.nginx" ) def test_case_is_lowered(self):