From 880d0ab1d67c6c01e5714471c454c147ff998877 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Fri, 28 Nov 2025 23:24:04 +0100 Subject: [PATCH] Removed block from main.yml and moved run_once logic to 01_core.yml --- roles/pkgmgr/tasks/01_core.yml | 4 +++- roles/pkgmgr/tasks/main.yml | 4 +--- roles/svc-db-mariadb/tasks/01_core.yml | 2 ++ roles/svc-db-mariadb/tasks/main.yml | 4 +--- roles/sys-ctl-alm-compose/tasks/01_core.yml | 2 ++ roles/sys-ctl-alm-compose/tasks/main.yml | 4 +--- roles/sys-ctl-alm-email/tasks/01_core.yml | 2 ++ roles/sys-ctl-alm-email/tasks/main.yml | 4 +--- roles/sys-ctl-alm-telegram/tasks/01_core.yml | 2 ++ roles/sys-ctl-alm-telegram/tasks/main.yml | 4 +--- roles/sys-ctl-cln-certs/tasks/01_core.yml | 4 +++- roles/sys-ctl-cln-certs/tasks/main.yml | 4 +--- roles/sys-ctl-hlth-btrfs/tasks/01_core.yml | 4 +++- roles/sys-ctl-hlth-btrfs/tasks/main.yml | 4 +--- roles/sys-ctl-hlth-disc-space/tasks/01_core.yml | 4 +++- roles/sys-ctl-hlth-disc-space/tasks/main.yml | 4 +--- roles/sys-ctl-hlth-docker-container/tasks/01_core.yml | 2 ++ roles/sys-ctl-hlth-docker-container/tasks/main.yml | 4 +--- roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml | 2 ++ roles/sys-ctl-hlth-docker-volumes/tasks/main.yml | 4 +--- roles/sys-ctl-hlth-journalctl/tasks/01_core.yml | 2 ++ roles/sys-ctl-hlth-journalctl/tasks/main.yml | 4 +--- roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml | 2 ++ roles/sys-ctl-mtn-cert-renew/tasks/main.yml | 4 +--- roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml | 4 +++- roles/sys-ctl-rpr-btrfs-balancer/tasks/main.yml | 1 - .../tasks/{01_deploy.yml => 01_core.yml} | 2 ++ roles/sys-front-inj-desktop/tasks/main.yml | 4 +--- roles/sys-service/tasks/01_core.yml | 2 ++ roles/sys-service/tasks/main.yml | 4 +--- roles/sys-svc-certbot/tasks/01_core.yml | 4 +++- roles/sys-svc-certbot/tasks/main.yml | 4 +--- roles/sys-svc-docker/tasks/01_core.yml | 4 +++- roles/sys-svc-docker/tasks/main.yml | 4 +--- roles/update-compose/tasks/01_core.yml | 2 ++ roles/update-compose/tasks/main.yml | 4 +--- roles/user-administrator/tasks/01_core.yml | 2 ++ roles/user-administrator/tasks/main.yml | 4 +--- roles/web-svc-coturn/tasks/01_core.yml | 4 +++- roles/web-svc-coturn/tasks/main.yml | 5 +---- 40 files changed, 67 insertions(+), 67 deletions(-) rename roles/sys-front-inj-desktop/tasks/{01_deploy.yml => 01_core.yml} (86%) diff --git a/roles/pkgmgr/tasks/01_core.yml b/roles/pkgmgr/tasks/01_core.yml index 8c5b124b..54ba4b9e 100644 --- a/roles/pkgmgr/tasks/01_core.yml +++ b/roles/pkgmgr/tasks/01_core.yml @@ -46,4 +46,6 @@ - name: "Update all repositories with pkgmgr" command: "pkgmgr pull --all" - when: MODE_UPDATE | bool \ No newline at end of file + when: MODE_UPDATE | bool + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/pkgmgr/tasks/main.yml b/roles/pkgmgr/tasks/main.yml index 1739af78..f8bcfecc 100644 --- a/roles/pkgmgr/tasks/main.yml +++ b/roles/pkgmgr/tasks/main.yml @@ -1,5 +1,3 @@ --- -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_pkgmgr is not defined \ No newline at end of file diff --git a/roles/svc-db-mariadb/tasks/01_core.yml b/roles/svc-db-mariadb/tasks/01_core.yml index 6474ab03..5573170b 100644 --- a/roles/svc-db-mariadb/tasks/01_core.yml +++ b/roles/svc-db-mariadb/tasks/01_core.yml @@ -46,3 +46,5 @@ when: - setup_mariadb_container_result is defined - setup_mariadb_container_result.changed + +- include_tasks: utils/run_once.yml diff --git a/roles/svc-db-mariadb/tasks/main.yml b/roles/svc-db-mariadb/tasks/main.yml index b6f0c90c..30d2df18 100644 --- a/roles/svc-db-mariadb/tasks/main.yml +++ b/roles/svc-db-mariadb/tasks/main.yml @@ -1,6 +1,4 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_svc_db_mariadb is not defined - name: "Initialize database for '{{ database_name }}'" diff --git a/roles/sys-ctl-alm-compose/tasks/01_core.yml b/roles/sys-ctl-alm-compose/tasks/01_core.yml index 27e7ac54..87820dd2 100644 --- a/roles/sys-ctl-alm-compose/tasks/01_core.yml +++ b/roles/sys-ctl-alm-compose/tasks/01_core.yml @@ -39,3 +39,5 @@ name: "{{ system_service_id | get_service_name(SOFTWARE_NAME, False) ~ escaped_name.stdout }}.service" state: started when: MODE_ASSERT | bool + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-alm-compose/tasks/main.yml b/roles/sys-ctl-alm-compose/tasks/main.yml index 48e82c59..f646924d 100644 --- a/roles/sys-ctl-alm-compose/tasks/main.yml +++ b/roles/sys-ctl-alm-compose/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_alm_compose 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 9c0b85f5..33f326d7 100644 --- a/roles/sys-ctl-alm-email/tasks/01_core.yml +++ b/roles/sys-ctl-alm-email/tasks/01_core.yml @@ -9,3 +9,5 @@ # 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 8b6641ee..79d574ec 100644 --- a/roles/sys-ctl-alm-email/tasks/main.yml +++ b/roles/sys-ctl-alm-email/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_alm_email is not defined \ No newline at end of file diff --git a/roles/sys-ctl-alm-telegram/tasks/01_core.yml b/roles/sys-ctl-alm-telegram/tasks/01_core.yml index 455f2eee..9e4168bd 100644 --- a/roles/sys-ctl-alm-telegram/tasks/01_core.yml +++ b/roles/sys-ctl-alm-telegram/tasks/01_core.yml @@ -21,3 +21,5 @@ community.general.pacman: name: curl state: present + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-alm-telegram/tasks/main.yml b/roles/sys-ctl-alm-telegram/tasks/main.yml index 23ef97f6..0f0159bb 100644 --- a/roles/sys-ctl-alm-telegram/tasks/main.yml +++ b/roles/sys-ctl-alm-telegram/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_alm_telegram is not defined \ No newline at end of file diff --git a/roles/sys-ctl-cln-certs/tasks/01_core.yml b/roles/sys-ctl-cln-certs/tasks/01_core.yml index da67ef84..33c1b7cd 100644 --- a/roles/sys-ctl-cln-certs/tasks/01_core.yml +++ b/roles/sys-ctl-cln-certs/tasks/01_core.yml @@ -17,4 +17,6 @@ system_service_timer_enabled: true system_service_on_calendar: "{{ SYS_SCHEDULE_CLEANUP_CERTS }}" system_service_copy_files: false - system_service_force_linear_sync: false \ No newline at end of file + system_service_force_linear_sync: false + +- include_tasks: utils/run_once.yml diff --git a/roles/sys-ctl-cln-certs/tasks/main.yml b/roles/sys-ctl-cln-certs/tasks/main.yml index 3d277260..de84c272 100644 --- a/roles/sys-ctl-cln-certs/tasks/main.yml +++ b/roles/sys-ctl-cln-certs/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_cln_certs is not defined \ No newline at end of file diff --git a/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml b/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml index fdc30d76..d776a464 100644 --- a/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml +++ b/roles/sys-ctl-hlth-btrfs/tasks/01_core.yml @@ -8,4 +8,6 @@ vars: system_service_on_calendar: "{{SYS_SCHEDULE_HEALTH_BTRFS}}" system_service_timer_enabled: true - system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}" \ No newline at end of file + system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}" + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-hlth-btrfs/tasks/main.yml b/roles/sys-ctl-hlth-btrfs/tasks/main.yml index 593f7562..2fe0e837 100644 --- a/roles/sys-ctl-hlth-btrfs/tasks/main.yml +++ b/roles/sys-ctl-hlth-btrfs/tasks/main.yml @@ -1,5 +1,3 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_hlth_btrfs is not defined diff --git a/roles/sys-ctl-hlth-disc-space/tasks/01_core.yml b/roles/sys-ctl-hlth-disc-space/tasks/01_core.yml index 4cdfd39b..e528f206 100644 --- a/roles/sys-ctl-hlth-disc-space/tasks/01_core.yml +++ b/roles/sys-ctl-hlth-disc-space/tasks/01_core.yml @@ -9,4 +9,6 @@ system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_DISC_SPACE }}" system_service_timer_enabled: true system_service_tpl_exec_start: "{{ system_service_script_exec }} {{ SIZE_PERCENT_CLEANUP_DISC_SPACE }}" - system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_DISC_SPACE }}" \ No newline at end of file + system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_DISC_SPACE }}" + +- include_tasks: utils/run_once.yml diff --git a/roles/sys-ctl-hlth-disc-space/tasks/main.yml b/roles/sys-ctl-hlth-disc-space/tasks/main.yml index a9f417ab..cb781d32 100644 --- a/roles/sys-ctl-hlth-disc-space/tasks/main.yml +++ b/roles/sys-ctl-hlth-disc-space/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_hlth_disc_space is not defined \ No newline at end of file diff --git a/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml b/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml index 1d5f6fd7..eb86f032 100644 --- a/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml +++ b/roles/sys-ctl-hlth-docker-container/tasks/01_core.yml @@ -14,3 +14,5 @@ system_service_timer_enabled: true system_service_on_calendar: "{{ SYS_SCHEDULE_HEALTH_DOCKER_CONTAINER }}" system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_REPAIR_DOCKER_SOFT }}" + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-hlth-docker-container/tasks/main.yml b/roles/sys-ctl-hlth-docker-container/tasks/main.yml index 69e4bbc6..2f92c41d 100644 --- a/roles/sys-ctl-hlth-docker-container/tasks/main.yml +++ b/roles/sys-ctl-hlth-docker-container/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_hlth_docker_container is not defined diff --git a/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml b/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml index c4326995..ea83f460 100644 --- a/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml +++ b/roles/sys-ctl-hlth-docker-volumes/tasks/01_core.yml @@ -10,3 +10,5 @@ system_service_timer_enabled: true system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }} {{ SYS_SERVICE_CLEANUP_ANONYMOUS_VOLUMES }}" system_service_tpl_exec_start: '{{ system_service_script_exec }} "{{ DOCKER_WHITELISTET_ANON_VOLUMES | join(" ") }}"' + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-hlth-docker-volumes/tasks/main.yml b/roles/sys-ctl-hlth-docker-volumes/tasks/main.yml index a1030353..cc6ebd08 100644 --- a/roles/sys-ctl-hlth-docker-volumes/tasks/main.yml +++ b/roles/sys-ctl-hlth-docker-volumes/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_hlth_docker_volumes is not defined diff --git a/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml b/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml index 2dab0c2e..1c1c9624 100644 --- a/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml +++ b/roles/sys-ctl-hlth-journalctl/tasks/01_core.yml @@ -10,3 +10,5 @@ system_service_timer_enabled: true system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}" system_service_suppress_flush: true # There are almost allways errors in the journalctl logs so suppression is neccessary to let playbook run + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-hlth-journalctl/tasks/main.yml b/roles/sys-ctl-hlth-journalctl/tasks/main.yml index a16f8d4d..ce2efef2 100644 --- a/roles/sys-ctl-hlth-journalctl/tasks/main.yml +++ b/roles/sys-ctl-hlth-journalctl/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_hlth_journalctl is not defined \ No newline at end of file diff --git a/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml b/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml index fd486bbe..6e8a116f 100644 --- a/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml +++ b/roles/sys-ctl-mtn-cert-renew/tasks/01_core.yml @@ -21,3 +21,5 @@ system_service_timer_enabled: true system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}" system_service_force_linear_sync: false + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-mtn-cert-renew/tasks/main.yml b/roles/sys-ctl-mtn-cert-renew/tasks/main.yml index 14f69892..87ae54e9 100644 --- a/roles/sys-ctl-mtn-cert-renew/tasks/main.yml +++ b/roles/sys-ctl-mtn-cert-renew/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_ctl_mtn_cert_renew is not defined diff --git a/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml b/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml index f40a0c0d..44577dd7 100644 --- a/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml +++ b/roles/sys-ctl-rpr-btrfs-balancer/tasks/01_core.yml @@ -18,4 +18,6 @@ system_service_timer_enabled: true system_service_tpl_on_failure: "{{ SYS_SERVICE_ON_FAILURE_COMPOSE }}" system_service_tpl_exec_start: "/bin/sh -c 'btrfs-auto-balancer 90 10'" - system_service_force_linear_sync: true \ No newline at end of file + system_service_force_linear_sync: true + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-ctl-rpr-btrfs-balancer/tasks/main.yml b/roles/sys-ctl-rpr-btrfs-balancer/tasks/main.yml index edb855e7..cdc7f450 100644 --- a/roles/sys-ctl-rpr-btrfs-balancer/tasks/main.yml +++ b/roles/sys-ctl-rpr-btrfs-balancer/tasks/main.yml @@ -1,4 +1,3 @@ - block: - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml when: run_once_sys_ctl_rpr_btrfs_balancer is not defined diff --git a/roles/sys-front-inj-desktop/tasks/01_deploy.yml b/roles/sys-front-inj-desktop/tasks/01_core.yml similarity index 86% rename from roles/sys-front-inj-desktop/tasks/01_deploy.yml rename to roles/sys-front-inj-desktop/tasks/01_core.yml index ca1dd08d..0eaecbe1 100644 --- a/roles/sys-front-inj-desktop/tasks/01_deploy.yml +++ b/roles/sys-front-inj-desktop/tasks/01_core.yml @@ -5,3 +5,5 @@ owner: "{{ NGINX.USER }}" group: "{{ NGINX.USER }}" mode: '0644' + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-front-inj-desktop/tasks/main.yml b/roles/sys-front-inj-desktop/tasks/main.yml index bd994f9c..ffcc4d01 100644 --- a/roles/sys-front-inj-desktop/tasks/main.yml +++ b/roles/sys-front-inj-desktop/tasks/main.yml @@ -1,6 +1,4 @@ -- block: - - include_tasks: 01_deploy.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_front_inj_desktop is not defined # --- Build tiny inline initializer (CSP-hashed) --- diff --git a/roles/sys-service/tasks/01_core.yml b/roles/sys-service/tasks/01_core.yml index 84066247..fe06aa84 100644 --- a/roles/sys-service/tasks/01_core.yml +++ b/roles/sys-service/tasks/01_core.yml @@ -6,3 +6,5 @@ - name: "reset (if enabled)" include_tasks: 02_reset.yml when: MODE_RESET | bool + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-service/tasks/main.yml b/roles/sys-service/tasks/main.yml index b224bac1..541b33cb 100644 --- a/roles/sys-service/tasks/main.yml +++ b/roles/sys-service/tasks/main.yml @@ -4,9 +4,7 @@ handler_role_name: "sys-daemon" when: run_once_sys_service is defined -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_service is not defined - name: "Execute service routines for '{{ system_service_id }}'" diff --git a/roles/sys-svc-certbot/tasks/01_core.yml b/roles/sys-svc-certbot/tasks/01_core.yml index 3290893a..d849d26a 100644 --- a/roles/sys-svc-certbot/tasks/01_core.yml +++ b/roles/sys-svc-certbot/tasks/01_core.yml @@ -5,4 +5,6 @@ - name: "Include tasks for 'No-Webroot-ACME-CHALLENGE-METHOD'" include_tasks: 02_no_webroot.yml - when: CERTBOT_ACME_CHALLENGE_METHOD != 'webroot' \ No newline at end of file + when: CERTBOT_ACME_CHALLENGE_METHOD != 'webroot' + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-svc-certbot/tasks/main.yml b/roles/sys-svc-certbot/tasks/main.yml index d042854a..b23aab77 100644 --- a/roles/sys-svc-certbot/tasks/main.yml +++ b/roles/sys-svc-certbot/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_svc_certbot is not defined diff --git a/roles/sys-svc-docker/tasks/01_core.yml b/roles/sys-svc-docker/tasks/01_core.yml index 056cd441..020b2040 100644 --- a/roles/sys-svc-docker/tasks/01_core.yml +++ b/roles/sys-svc-docker/tasks/01_core.yml @@ -25,4 +25,6 @@ - sys-ctl-hlth-docker-container - sys-ctl-hlth-docker-volumes - sys-ctl-rpr-docker-hard - when: SYS_SVC_DOCKER_LOAD_SERVICES | bool \ No newline at end of file + when: SYS_SVC_DOCKER_LOAD_SERVICES | bool + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/sys-svc-docker/tasks/main.yml b/roles/sys-svc-docker/tasks/main.yml index e31fc687..b6627cee 100644 --- a/roles/sys-svc-docker/tasks/main.yml +++ b/roles/sys-svc-docker/tasks/main.yml @@ -1,5 +1,3 @@ --- -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_sys_svc_docker is not defined diff --git a/roles/update-compose/tasks/01_core.yml b/roles/update-compose/tasks/01_core.yml index 74983cdc..e389cea3 100644 --- a/roles/update-compose/tasks/01_core.yml +++ b/roles/update-compose/tasks/01_core.yml @@ -13,3 +13,5 @@ include_role: name: update-apt when: ansible_distribution == "Debian" + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/update-compose/tasks/main.yml b/roles/update-compose/tasks/main.yml index 9c1b6559..d2fc3d0a 100644 --- a/roles/update-compose/tasks/main.yml +++ b/roles/update-compose/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_update_compose is not defined \ No newline at end of file diff --git a/roles/user-administrator/tasks/01_core.yml b/roles/user-administrator/tasks/01_core.yml index db2eb8be..e7353eed 100644 --- a/roles/user-administrator/tasks/01_core.yml +++ b/roles/user-administrator/tasks/01_core.yml @@ -52,3 +52,5 @@ name: user vars: user_name: "administrator" + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/user-administrator/tasks/main.yml b/roles/user-administrator/tasks/main.yml index 52f7867e..f2587bd4 100644 --- a/roles/user-administrator/tasks/main.yml +++ b/roles/user-administrator/tasks/main.yml @@ -1,4 +1,2 @@ -- block: - - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_user_administrator is not defined \ No newline at end of file diff --git a/roles/web-svc-coturn/tasks/01_core.yml b/roles/web-svc-coturn/tasks/01_core.yml index c8e1b082..3f0dbee2 100644 --- a/roles/web-svc-coturn/tasks/01_core.yml +++ b/roles/web-svc-coturn/tasks/01_core.yml @@ -3,4 +3,6 @@ name: sys-stk-semi-stateless vars: docker_compose_file_creation_enabled: true - docker_pull_git_repository: false \ No newline at end of file + docker_pull_git_repository: false + +- include_tasks: utils/run_once.yml \ No newline at end of file diff --git a/roles/web-svc-coturn/tasks/main.yml b/roles/web-svc-coturn/tasks/main.yml index 4abd9dc3..d5e06fec 100644 --- a/roles/web-svc-coturn/tasks/main.yml +++ b/roles/web-svc-coturn/tasks/main.yml @@ -1,6 +1,3 @@ --- -- block: - - name: "Load core functions for '{{ application_id }}'" - include_tasks: 01_core.yml - - include_tasks: utils/run_once.yml +- include_tasks: 01_core.yml when: run_once_web_svc_coturn is not defined \ No newline at end of file