diff --git a/group_vars/all/07_services.yml b/group_vars/all/07_services.yml index 09894ebd..9330d652 100644 --- a/group_vars/all/07_services.yml +++ b/group_vars/all/07_services.yml @@ -2,7 +2,9 @@ # Services ## Meta -SYS_SERVICE_SUFFIX: ".{{ SOFTWARE_NAME | lower }}.service" +SYS_SERVICE_SUFFIX: ".{{ SOFTWARE_NAME | lower }}.service" +SYS_SERVICE_ALL_ENABLED: false # Flush all services +SYS_SERVICE_DEFAULT_STATE: "{{ omit }}" ## Names SYS_SERVICE_CLEANUP_BACKUPS_OLD: "{{ 'sys-ctl-cln-backups' | get_service_name(SOFTWARE_NAME) }}" @@ -13,9 +15,9 @@ SYS_SERVICE_REPAIR_DOCKER_HARD: "{{ 'sys-ctl-rpr-docker-hard' | get_servic SYS_SERVICE_UPDATE_DOCKER: "{{ 'update-docker' | get_service_name(SOFTWARE_NAME) }}" ## On Failure -SYS_SERVICE_ON_FAILURE_COMPOSE: "sys-ctl-alm-compose.{{ SOFTWARE_NAME }}@%i.service" -SYS_SERVICE_ON_FAILURE_EMAIL: "sys-ctl-alm-email.{{ SOFTWARE_NAME }}@%i.service" -SYS_SERVICE_ON_FAILURE_TELEGRAM: "sys-ctl-alm-telegram.{{ SOFTWARE_NAME }}@%i.service" +SYS_SERVICE_ON_FAILURE_COMPOSE: "sys-ctl-alm-compose.{{ SOFTWARE_NAME | lower }}@%i.service" +SYS_SERVICE_ON_FAILURE_EMAIL: "sys-ctl-alm-email.{{ SOFTWARE_NAME | lower }}@%i.service" +SYS_SERVICE_ON_FAILURE_TELEGRAM: "sys-ctl-alm-telegram.{{ SOFTWARE_NAME | lower }}@%i.service" ## Groups SYS_SERVICE_GROUP_BACKUPS: > diff --git a/group_vars/all/08_timer.yml b/group_vars/all/08_timer.yml index 60b3a656..a8d78596 100644 --- a/group_vars/all/08_timer.yml +++ b/group_vars/all/08_timer.yml @@ -2,15 +2,14 @@ # Service Timers ## Meta -SYS_TIMER_SUFFIX: ".{{ SOFTWARE_NAME | lower }}.timer" +SYS_TIMER_SUFFIX: ".{{ SOFTWARE_NAME | lower }}.timer" +SYS_TIMER_ALL_ENABLED: false # Runtime Variables for Process Control - Activates all timers, independend if the handlers had been triggered ## Server Tact Variables HOURS_SERVER_AWAKE: "0..23" # Ours in which the server is "awake" (100% working). Rest of the time is reserved for maintanance RANDOMIZED_DELAY_SEC: "5min" # Random delay for systemd timers to avoid peak loads. -ACTIVATE_ALL_TIMERS: false # Runtime Variables for Process Control - Activates all timers, independend if the handlers had been triggered - ## Timeouts for all services SYS_TIMEOUT_CLEANUP_SERVICES: "15min" SYS_TIMEOUT_STORAGE_OPTIMIZER: "10min" diff --git a/roles/sys-svc-docker/tasks/03_cleanup.yml b/roles/sys-svc-docker/tasks/03_cleanup.yml index 91effbfa..7d7cf640 100644 --- a/roles/sys-svc-docker/tasks/03_cleanup.yml +++ b/roles/sys-svc-docker/tasks/03_cleanup.yml @@ -1,3 +1,7 @@ +- name: Load role to delete anonymous volumes + include_role: + name: sys-svc-cln-anon-volumes + - name: Prune Docker resources become: true ansible.builtin.command: docker system prune -f \ No newline at end of file diff --git a/roles/sys-systemctl/tasks/05_service.yml b/roles/sys-systemctl/tasks/05_service.yml index 37a9f07b..1fd7de30 100644 --- a/roles/sys-systemctl/tasks/05_service.yml +++ b/roles/sys-systemctl/tasks/05_service.yml @@ -36,3 +36,10 @@ src: "{{ systemctl_template_src }}" dest: "{{ [ PATH_SYSTEM_SERVICE_DIR, systemctl_id | get_service_name(SOFTWARE_NAME) ] | path_join }}" notify: "{{ 'reload system daemon' if systemctl_uses_at else 'refresh systemctl service' }}" + +- name: refresh systemctl service when SYS_SERVICE_ALL_ENABLED + command: /bin/true + notify: "refresh systemctl service" + when: + - SYS_SERVICE_ALL_ENABLED | bool + - not systemctl_uses_at diff --git a/roles/sys-systemctl/vars/main.yml b/roles/sys-systemctl/vars/main.yml index de096cc0..c5245582 100644 --- a/roles/sys-systemctl/vars/main.yml +++ b/roles/sys-systemctl/vars/main.yml @@ -8,4 +8,4 @@ systemctl_script_dir: "{{ [ PATH_SYSTEMCTL_SCRIPTS, systemctl_id ] | path_jo ## Settings systemctl_copy_files: true # When set to false file copying will be skipped systemctl_timer_enabled: false # When set to true timmer will be loaded -systemctl_state: "{{ omit }}" \ No newline at end of file +systemctl_state: "{{ SYS_SERVICE_DEFAULT_STATE }}" \ No newline at end of file diff --git a/roles/sys-timer/tasks/main.yml b/roles/sys-timer/tasks/main.yml index 29135074..927923dd 100644 --- a/roles/sys-timer/tasks/main.yml +++ b/roles/sys-timer/tasks/main.yml @@ -12,6 +12,6 @@ name: "{{ sys_timer_file }}" state: restarted enabled: yes - when: dummy_timer.changed or ACTIVATE_ALL_TIMERS | bool + when: dummy_timer.changed or SYS_TIMER_ALL_ENABLED | bool async: "{{ ASYNC_TIME if ASYNC_ENABLED | bool else omit }}" poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}" diff --git a/roles/web-app-mig/tasks/02_build_data.yml b/roles/web-app-mig/tasks/02_build_data.yml index f29ba490..5bddba77 100644 --- a/roles/web-app-mig/tasks/02_build_data.yml +++ b/roles/web-app-mig/tasks/02_build_data.yml @@ -6,9 +6,3 @@ async: "{{ (3600 if ASYNC_ENABLED | bool else omit) | default(omit) }}" poll: "{{ ASYNC_POLL if ASYNC_ENABLED | bool else omit }}" register: mig_build_job - -- name: Fail if MIG build job did not start - fail: - msg: > - MIG build job failed to start. No job ID returned. - when: mig_build_job.ansible_job_id is not defined