diff --git a/group_vars/all/07_services.yml b/group_vars/all/07_services.yml index ccbe1ce0..d668c540 100644 --- a/group_vars/all/07_services.yml +++ b/group_vars/all/07_services.yml @@ -5,12 +5,13 @@ SYS_SERVICE_SUFFIX: ".{{ SOFTWARE_NAME | lower }}.service" ## Names -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) }}" -SYS_SERVICE_REPAIR_DOCKER_SOFT: "{{ 'sys-ctl-rpr-docker-soft' | get_service_name(SOFTWARE_NAME) }}" -SYS_SERVICE_REPAIR_DOCKER_HARD: "{{ 'sys-ctl-rpr-docker-hard' | get_service_name(SOFTWARE_NAME) }}" -SYS_SERVICE_UPDATE_DOCKER: "{{ 'update-docker' | 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) }}" +SYS_SERVICE_BACKUP_DOCKER_2_LOC: "{{ 'sys-ctl-bkp-docker-2-loc' | get_service_name(SOFTWARE_NAME) }}" +SYS_SERVICE_REPAIR_DOCKER_SOFT: "{{ 'sys-ctl-rpr-docker-soft' | get_service_name(SOFTWARE_NAME) }}" +SYS_SERVICE_REPAIR_DOCKER_HARD: "{{ 'sys-ctl-rpr-docker-hard' | get_service_name(SOFTWARE_NAME) }}" +SYS_SERVICE_UPDATE_DOCKER: "{{ 'update-docker' | get_service_name(SOFTWARE_NAME) }}" ## On Failure SYS_SERVICE_ON_FAILURE_COMPOSE: "{{ ('sys-ctl-alm-compose@') | get_service_name(SOFTWARE_NAME, False) }}%n.service" @@ -40,12 +41,12 @@ SYS_SERVICE_GROUP_MAINTANANCE: > SYS_SERVICE_GROUP_MANIPULATION: > {{ ( - SYS_SERVICE_GROUP_BACKUPS + - SYS_SERVICE_GROUP_CLEANUP + - SYS_SERVICE_GROUP_REPAIR + - SYS_SERVICE_GROUP_OPTIMIZATION + + SYS_SERVICE_GROUP_BACKUPS + + SYS_SERVICE_GROUP_CLEANUP + + SYS_SERVICE_GROUP_REPAIR + + SYS_SERVICE_GROUP_OPTIMIZATION + SYS_SERVICE_GROUP_MAINTANANCE + - [ SYS_SERVICE_UPDATE_DOCKER ] + [ SYS_SERVICE_UPDATE_DOCKER ] ) | sort }} diff --git a/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2 b/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2 index d1543319..69e12783 100644 --- a/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2 +++ b/roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2 @@ -4,5 +4,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA [Service] Type=oneshot -ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_GROUP_BACKUPS | join(' ') }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}" +ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}" ExecStart={{ system_service_script_exec }} diff --git a/roles/sys-ctl-bkp-docker-2-loc/templates/systemctl.service.j2 b/roles/sys-ctl-bkp-docker-2-loc/templates/systemctl.service.j2 index 64f3666a..02532729 100644 --- a/roles/sys-ctl-bkp-docker-2-loc/templates/systemctl.service.j2 +++ b/roles/sys-ctl-bkp-docker-2-loc/templates/systemctl.service.j2 @@ -4,5 +4,5 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA [Service] Type=oneshot -ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_BACKUP_RMT_2_LOC }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}" +ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_BACKUP_DOCKER_2_LOC }} --timeout "{{ SYS_TIMEOUT_BACKUP_SERVICES }}" ExecStart=/bin/sh -c '{{ BKP_DOCKER_2_LOC_EXEC }}' diff --git a/roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2 b/roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2 index 3a6a0387..f343f929 100644 --- a/roles/sys-ctl-rpr-docker-hard/templates/systemctl.service.j2 +++ b/roles/sys-ctl-rpr-docker-hard/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(' ') }} {{ SYS_SERVICE_REPAIR_DOCKER_HARD }} --timeout "{{ SYS_TIMEOUT_RESTART_DOCKER }}" +ExecStartPre=/usr/bin/python {{ PATH_SYSTEM_LOCK_SCRIPT }} {{ SYS_SERVICE_GROUP_MANIPULATION | join(' ') }} --ignore {{ SYS_SERVICE_REPAIR_DOCKER_HARD }} --timeout "{{ SYS_TIMEOUT_RESTART_DOCKER }}" ExecStart={{ system_service_script_exec }} \ No newline at end of file