From c9f959058b39d32235a29d2f93d40ca92ea1f5ff Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Mon, 1 Dec 2025 05:30:41 +0100 Subject: [PATCH] Removed unnecessary blocks --- roles/desk-gnome-caffeine/tasks/main.yml | 3 +-- roles/desk-ssh/tasks/main.yml | 3 +-- roles/dev-yay/tasks/main.yml | 3 +-- roles/docker-compose/tasks/01_core.yml | 2 +- roles/docker-container/tasks/01_core.yml | 5 +++++ roles/docker-container/tasks/main.yml | 8 ++------ roles/svc-opt-swapfile/tasks/main.yml | 3 +-- roles/sys-ctl-alm-email/tasks/01_core.yml | 6 +++--- roles/sys-ctl-alm-email/tasks/main.yml | 2 +- roles/sys-ctl-cln-bkps/tasks/main.yml | 3 +-- roles/sys-ctl-cln-faild-bkps/tasks/main.yml | 3 +-- roles/sys-ctl-hlth-csp/tasks/main.yml | 3 +-- roles/sys-ctl-hlth-msmtp/tasks/main.yml | 3 +-- roles/sys-ctl-hlth-webserver/tasks/main.yml | 3 +-- roles/sys-ctl-rpr-docker-hard/tasks/main.yml | 3 +-- roles/sys-ctl-rpr-docker-soft/tasks/main.yml | 3 +-- roles/sys-dns-wildcards/tasks/main.yml | 3 +-- roles/sys-svc-dns/tasks/main.yml | 8 ++++---- roles/sys-svc-letsencrypt/tasks/main.yml | 3 +-- roles/sys-svc-webserver-core/tasks/main.yml | 3 +-- roles/web-app-xwiki/tasks/main.yml | 3 +-- 21 files changed, 31 insertions(+), 45 deletions(-) create mode 100644 roles/docker-container/tasks/01_core.yml diff --git a/roles/desk-gnome-caffeine/tasks/main.yml b/roles/desk-gnome-caffeine/tasks/main.yml index 6417399f..f44c7aa4 100644 --- a/roles/desk-gnome-caffeine/tasks/main.yml +++ b/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 diff --git a/roles/desk-ssh/tasks/main.yml b/roles/desk-ssh/tasks/main.yml index 23832eb6..754d3447 100644 --- a/roles/desk-ssh/tasks/main.yml +++ b/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 \ No newline at end of file diff --git a/roles/dev-yay/tasks/main.yml b/roles/dev-yay/tasks/main.yml index 98b2ddfc..4c665265 100644 --- a/roles/dev-yay/tasks/main.yml +++ b/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 diff --git a/roles/docker-compose/tasks/01_core.yml b/roles/docker-compose/tasks/01_core.yml index 385ec596..69da82be 100644 --- a/roles/docker-compose/tasks/01_core.yml +++ b/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 diff --git a/roles/docker-container/tasks/01_core.yml b/roles/docker-container/tasks/01_core.yml new file mode 100644 index 00000000..53f7e525 --- /dev/null +++ b/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 \ No newline at end of file diff --git a/roles/docker-container/tasks/main.yml b/roles/docker-container/tasks/main.yml index 8a1085b2..0ff64cc6 100644 --- a/roles/docker-container/tasks/main.yml +++ b/roles/docker-container/tasks/main.yml @@ -1,6 +1,2 @@ -- block: - - include_role: - 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 +- include_tasks: 01_core.yml + when: run_once_docker_container is not defined \ No newline at end of file diff --git a/roles/svc-opt-swapfile/tasks/main.yml b/roles/svc-opt-swapfile/tasks/main.yml index 783f4d96..bd0f5cc1 100644 --- a/roles/svc-opt-swapfile/tasks/main.yml +++ b/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 diff --git a/roles/sys-ctl-alm-email/tasks/01_core.yml b/roles/sys-ctl-alm-email/tasks/01_core.yml index 33f326d7..95b79e54 100644 --- a/roles/sys-ctl-alm-email/tasks/01_core.yml +++ b/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 diff --git a/roles/sys-ctl-alm-email/tasks/main.yml b/roles/sys-ctl-alm-email/tasks/main.yml index 79d574ec..c137ffc1 100644 --- a/roles/sys-ctl-alm-email/tasks/main.yml +++ b/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 \ No newline at end of file + when: not run_once_sys_ctl_alm_email | default(false) \ No newline at end of file diff --git a/roles/sys-ctl-cln-bkps/tasks/main.yml b/roles/sys-ctl-cln-bkps/tasks/main.yml index a4c8a54b..2b95bfc1 100644 --- a/roles/sys-ctl-cln-bkps/tasks/main.yml +++ b/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 diff --git a/roles/sys-ctl-cln-faild-bkps/tasks/main.yml b/roles/sys-ctl-cln-faild-bkps/tasks/main.yml index bd25969a..659bfa4b 100644 --- a/roles/sys-ctl-cln-faild-bkps/tasks/main.yml +++ b/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 \ No newline at end of file diff --git a/roles/sys-ctl-hlth-csp/tasks/main.yml b/roles/sys-ctl-hlth-csp/tasks/main.yml index f3038984..1d5ce26c 100644 --- a/roles/sys-ctl-hlth-csp/tasks/main.yml +++ b/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 \ No newline at end of file diff --git a/roles/sys-ctl-hlth-msmtp/tasks/main.yml b/roles/sys-ctl-hlth-msmtp/tasks/main.yml index 5a508e3c..3ccab4ac 100644 --- a/roles/sys-ctl-hlth-msmtp/tasks/main.yml +++ b/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 diff --git a/roles/sys-ctl-hlth-webserver/tasks/main.yml b/roles/sys-ctl-hlth-webserver/tasks/main.yml index a0d2a885..eec6615a 100644 --- a/roles/sys-ctl-hlth-webserver/tasks/main.yml +++ b/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 diff --git a/roles/sys-ctl-rpr-docker-hard/tasks/main.yml b/roles/sys-ctl-rpr-docker-hard/tasks/main.yml index f27c0219..746f3d25 100644 --- a/roles/sys-ctl-rpr-docker-hard/tasks/main.yml +++ b/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 \ No newline at end of file diff --git a/roles/sys-ctl-rpr-docker-soft/tasks/main.yml b/roles/sys-ctl-rpr-docker-soft/tasks/main.yml index 8489db63..528bcece 100644 --- a/roles/sys-ctl-rpr-docker-soft/tasks/main.yml +++ b/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 \ No newline at end of file diff --git a/roles/sys-dns-wildcards/tasks/main.yml b/roles/sys-dns-wildcards/tasks/main.yml index 69b966ea..b8d04de3 100644 --- a/roles/sys-dns-wildcards/tasks/main.yml +++ b/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 \ No newline at end of file diff --git a/roles/sys-svc-dns/tasks/main.yml b/roles/sys-svc-dns/tasks/main.yml index afc50f94..4ab8836f 100644 --- a/roles/sys-svc-dns/tasks/main.yml +++ b/roles/sys-svc-dns/tasks/main.yml @@ -1,4 +1,4 @@ -- block: - - include_tasks: 01_core.yml - when: DNS_PROVIDER == 'cloudflare' - when: run_once_sys_svc_dns is not defined +- include_tasks: 01_core.yml + when: + - DNS_PROVIDER == 'cloudflare' + - run_once_sys_svc_dns is not defined diff --git a/roles/sys-svc-letsencrypt/tasks/main.yml b/roles/sys-svc-letsencrypt/tasks/main.yml index 528296be..31fc0ad1 100644 --- a/roles/sys-svc-letsencrypt/tasks/main.yml +++ b/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 diff --git a/roles/sys-svc-webserver-core/tasks/main.yml b/roles/sys-svc-webserver-core/tasks/main.yml index 2b46a771..92620e21 100644 --- a/roles/sys-svc-webserver-core/tasks/main.yml +++ b/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 diff --git a/roles/web-app-xwiki/tasks/main.yml b/roles/web-app-xwiki/tasks/main.yml index faa96241..2a5e8e10 100644 --- a/roles/web-app-xwiki/tasks/main.yml +++ b/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