kevinveenbirkenbach/computer-playbook
1
0
Fork 0
mirror of https://github.com/kevinveenbirkenbach/computer-playbook.git synced 2025-11-03 19:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed sys-ctl-cln-backups to sys-ctl-cln-bkps

Browse Source
This commit is contained in:
Kevin Veen-Birkenbach
2025-08-19 12:15:33 +02:00
parent 83b9f697ab
commit 7ef20474a0
7 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/all/07_services.yml
View File

@@ -7,7 +7,7 @@ SYS_SERVICE_ALL_ENABLED: false # Flush all services
SYS_SERVICE_DEFAULT_STATE: "{{ omit }}" SYS_SERVICE_DEFAULT_STATE: "{{ omit }}"
## Names ## 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_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_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) }}" SYS_SERVICE_BACKUP_RMT_2_LOC: "{{ 'svc-bkp-rmt-2-loc' | get_service_name(SOFTWARE_NAME) }}"

3
roles/sys-ctl-cln-bkps/tasks/main.yml
View File

@@ -1,5 +1,6 @@
- block: - block:
- include_tasks: 01_core.yml - include_tasks: 01_core.yml
- include_tasks: utils/run_once.yml - include_tasks: utils/run_once.yml
vars:
flush_handlers: true
when: run_once_sys_ctl_cln_bkps is not defined when: run_once_sys_ctl_cln_bkps is not defined

2
roles/sys-ctl-cln-bkps/templates/systemctl.service.j2
View File

@@ -4,5 +4,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }}
[Service] [Service]
Type=oneshot 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}} ExecStart={{ systemctl_script_exec }} --backups-folder-path {{ BACKUPS_FOLDER_PATH }} --maximum-backup-size-percent {{SIZE_PERCENT_MAXIMUM_BACKUP}}

2
roles/sys-ctl-cln-disc-space/templates/script.sh.j2
View File

@@ -24,7 +24,7 @@ if [ "$force_freeing" = true ]; then
{% if BACKUPS_FOLDER_PATH is defined and SIZE_PERCENT_MAXIMUM_BACKUP is defined %} {% if BACKUPS_FOLDER_PATH is defined and SIZE_PERCENT_MAXIMUM_BACKUP is defined %}
echo "cleaning up backups" && 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 %} {% endif %}
if pacman -Qs $package > /dev/null ; then if pacman -Qs $package > /dev/null ; then

2
roles/sys-timer-cln-bkps/README.md
View File

@@ -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: Optimized for automated maintenance, this role:
- Sets a fact for the service name. - 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 ## Purpose

4
roles/sys-timer-cln-bkps/tasks/01_core.yml
View File

@@ -6,9 +6,9 @@
vars: vars:
flush_handlers: true 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: 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 }}" - name: "include role for sys-timer for {{ systemctl_timer_service }}"
include_role: include_role:

8
tests/unit/filter_plugins/test_get_service_name.py
View File

@@ -4,8 +4,8 @@ from filter_plugins import get_service_name
class TestGetServiceName(unittest.TestCase): class TestGetServiceName(unittest.TestCase):
def test_default_suffix_service(self): def test_default_suffix_service(self):
self.assertEqual( self.assertEqual(
get_service_name.get_service_name("sys-ctl-cln-backups", "nginx"), get_service_name.get_service_name("sys-ctl-cln-bkps", "nginx"),
"sys-ctl-cln-backups.nginx.service" "sys-ctl-cln-bkps.nginx.service"
) )
def test_default_suffix(self): def test_default_suffix(self):
@@ -26,8 +26,8 @@ class TestGetServiceName(unittest.TestCase):
"sys-ctl-bkp.postgres@" "sys-ctl-bkp.postgres@"
) )
self.assertEqual( self.assertEqual(
get_service_name.get_service_name("sys-ctl-cln-backups", "nginx", False), get_service_name.get_service_name("sys-ctl-cln-bkps", "nginx", False),
"sys-ctl-cln-backups.nginx" "sys-ctl-cln-bkps.nginx"
) )
def test_case_is_lowered(self): def test_case_is_lowered(self):