Optimized webserver on failure

roles/svc-bkp-rmt-2-loc/templates/systemctl.service.j2

@@ -6,4 +6,3 @@ OnFailure={{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_BACKUPS_FA
 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 }}"
 ExecStart={{ system_service_script_exec }}
-

roles/sys-ctl-hlth-btrfs/tasks/01_core.yml

@@ -8,3 +8,4 @@
   vars:
     system_service_on_calendar:   "{{SYS_SCHEDULE_HEALTH_BTRFS}}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-hlth-csp/tasks/01_core.yml

@@ -15,3 +15,4 @@
   vars:
     system_service_on_calendar:     "{{ SYS_SCHEDULE_HEALTH_CSP_CRAWLER }}"
     system_service_timer_enabled:   true
+    system_service_tpl_on_failure:  "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-hlth-disc-space/tasks/main.yml

@@ -4,10 +4,12 @@
       name: sys-ctl-alm-compose
     when: run_once_sys_ctl_alm_compose is not defined
   - include_tasks: utils/run_once.yml
-  when: run_once_sys_ctl_hlth_disc_space is not defined
-
-- include_role:
+  - include_role:
       name: sys-service
       vars:
         system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}"
         system_service_timer_enabled:  true
+        system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
+  - name: "Flush handlers a second time"
+    include_tasks: utils/run_once.yml
+  when: run_once_sys_ctl_hlth_disc_space is not defined

roles/sys-ctl-hlth-docker-container/tasks/01_core.yml

@@ -8,3 +8,4 @@
   vars:
     system_service_timer_enabled:  true
     system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_DOCKER_CONTAINER }}"
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml

@@ -8,3 +8,4 @@
   vars:
     system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_DOCKER_VOLUMES}}"
     system_service_timer_enabled: true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-hlth-journalctl/tasks/01_core.yml

@@ -8,3 +8,4 @@
   vars:
     system_service_on_calendar:   "{{SYS_SCHEDULE_HEALTH_JOURNALCTL}}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-hlth-msmtp/tasks/01_core.yml

@@ -6,5 +6,6 @@
 - include_role:
     name: sys-service
   vars:
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"
     system_service_on_calendar:    "{{ SYS_SCHEDULE_HEALTH_MSMTP }}"
     system_service_timer_enabled:  true

roles/sys-ctl-hlth-webserver/tasks/01_core.yml

@@ -1,20 +1,20 @@
-- block:
-  - name: Include dependencies
+- name: Include dependencies
   include_role:
     name: '{{ item }}'
   loop:
   - dev-python-pip
   - sys-ctl-alm-compose
-  - include_tasks: utils/run_once.yml
-  when: run_once_sys_ctl_hlth_webserver is not defined
 
 - name: Install required Python modules
   community.general.pacman:
     name: python-requests
     state: present
 
+- meta: flush_handlers
+
 - include_role:
     name: sys-service
   vars:
-    system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_NGINX}}"
+    system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_NGINX }}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-mtn-cert-deploy/tasks/01_core.yml

@@ -1,6 +1,8 @@
 - name: Include dependency 'sys-ctl-alm-compose'
   include_role:
     name: sys-ctl-alm-compose
+    vars:
+      flush_handlers: true
   when: run_once_sys_ctl_alm_compose is not defined
 
 - include_role:
@@ -10,3 +12,4 @@
     system_service_on_calendar:   "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_DEPLOY }}"
     persistent:                    "true"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml

@@ -19,3 +19,4 @@
     system_service_on_calendar:     "{{ SYS_SCHEDULE_MAINTANANCE_LETSENCRYPT_RENEW }}"
     persistent:                     true
     system_service_timer_enabled:   true
+    system_service_tpl_on_failure:  "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml

@@ -15,3 +15,4 @@
     system_service_copy_files:    false
     system_service_on_calendar:   "{{SYS_SCHEDULE_REPAIR_BTRFS_AUTO_BALANCER}}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"

roles/sys-ctl-rpr-docker-soft/tasks/01_core.yml

@@ -8,3 +8,4 @@
   vars:
     system_service_on_calendar:   "{{SYS_SCHEDULE_REPAIR_DOCKER_SOFT}}"
     system_service_timer_enabled:  true
+    system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}"