Removed unnecessary blocks

roles/desk-gnome-caffeine/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_desk_gnome_caffeine is not defined

roles/desk-ssh/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_desk_ssh is not defined

roles/dev-yay/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_dev_yay is not defined

roles/docker-compose/tasks/01_core.yml

@@ -6,8 +6,8 @@
 - name: "Load docker container role"
   include_role:
     name: docker-container
-
   when: run_once_docker_container is not defined
+  
 - name: "reset (if enabled)"
   include_tasks: 02_reset.yml
   when: MODE_RESET | bool

roles/docker-container/tasks/01_core.yml

@@ -0,0 +1,5 @@
+- include_role:
+    name: sys-svc-docker
+  when: run_once_sys_svc_docker is not defined
+
+- include_tasks: utils/run_once.yml

roles/docker-container/tasks/main.yml

@@ -1,6 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_role:
+  when: run_once_docker_container is not defined
-      name: sys-svc-docker
-    when: run_once_sys_svc_docker is not defined
-  - include_tasks: utils/run_once.yml
-  when: run_once_docker_container is not defined

roles/svc-opt-swapfile/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-    - include_tasks: 01_core.yml
   when: run_once_svc_opt_swapfile is not defined

roles/sys-ctl-alm-email/tasks/01_core.yml

@@ -1,7 +1,9 @@
+- include_tasks: utils/run_once.yml
+
 - name: Include dependencies
   include_role:
     name: "sys-svc-msmtp"
-  when: run_once_sys_svc_msmtp is not defined or run_once_sys_svc_msmtp is false
+  when: not run_once_sys_svc_msmtp | default(false)
 
 - include_role:
     name: sys-service
@@ -9,5 +11,3 @@
     # If the email notifier fails, trigger the Telegram notifier,
     # passing the failing unit's name as the instance text.
     system_service_tpl_on_failure: "{{ ('sys-ctl-alm-telegram@') | get_service_name(SOFTWARE_NAME, False) }}%n.service"
-
-- include_tasks: utils/run_once.yml

roles/sys-ctl-alm-email/tasks/main.yml

@@ -1,2 +1,2 @@
 - include_tasks: 01_core.yml
-  when: run_once_sys_ctl_alm_email is not defined
+  when: not run_once_sys_ctl_alm_email | default(false)

roles/sys-ctl-cln-bkps/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-    - include_tasks: 01_core.yml
   when: run_once_sys_ctl_cln_bkps is not defined

roles/sys-ctl-cln-faild-bkps/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-    - include_tasks: 01_core.yml
   when: run_once_sys_ctl_cln_faild_bkps is not defined

roles/sys-ctl-hlth-csp/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-    - include_tasks: 01_core.yml
   when: run_once_sys_ctl_hlth_csp is not defined

roles/sys-ctl-hlth-msmtp/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_sys_ctl_hlth_msmtp is not defined

roles/sys-ctl-hlth-webserver/tasks/main.yml

@@ -1,5 +1,4 @@
-- block:
+- include_tasks: 01_core.yml
-    - include_tasks: 01_core.yml
   when: run_once_sys_ctl_hlth_webserver is not defined
 
 

roles/sys-ctl-rpr-docker-hard/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-    - include_tasks: 01_core.yml
   when: run_once_sys_ctl_rpr_docker_hard is not defined

roles/sys-ctl-rpr-docker-soft/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-    - include_tasks: 01_core.yml
   when: run_once_sys_ctl_rpr_docker_soft is not defined

roles/sys-dns-wildcards/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_sys_dns_wildcards is not defined

roles/sys-svc-dns/tasks/main.yml

@@ -1,4 +1,4 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
+  when: 
-    when: DNS_PROVIDER == 'cloudflare'
+    - DNS_PROVIDER == 'cloudflare'
-  when: run_once_sys_svc_dns is not defined
+    - run_once_sys_svc_dns is not defined

roles/sys-svc-letsencrypt/tasks/main.yml

@@ -1,3 +1,2 @@
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_sys_svc_letsencrypt is not defined

roles/sys-svc-webserver-core/tasks/main.yml

@@ -1,4 +1,3 @@
 ---
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_sys_svc_webserver_core is not defined

roles/web-app-xwiki/tasks/main.yml

@@ -1,4 +1,3 @@
 ---
-- block:
+- include_tasks: 01_core.yml
-  - include_tasks: 01_core.yml
   when: run_once_web_app_xwiki is not defined