From b575b6f618e654a65f55d0d07719d8b78d984b03 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 14 Dec 2023 00:32:52 +0100 Subject: [PATCH] Implemented parameter to force backups before update --- group_vars/all | 9 +++++---- roles/update-docker/templates/update-docker.service.j2 | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/group_vars/all b/group_vars/all index f366bf12..2bf44ee7 100644 --- a/group_vars/all +++ b/group_vars/all @@ -33,10 +33,11 @@ path_docker_compose_instances: "{{path_administrator_home}}dock path_system_maintenance_service_freezer_script: "{{path_administrator_scripts}}system-maintenance-service-freezer.py" # Runtime Variables -activate_all_timers: false # Activates all timers, independend if the handlers had been triggered -nginx_matomo_tracking: false # Activates matomo tracking on all html pages -nginx_www_redirect: true # Implements an redirect from all www. domains to the main domain -execute_updates: true # Executes updates +activate_all_timers: false # Activates all timers, independend if the handlers had been triggered +nginx_matomo_tracking: false # Activates matomo tracking on all html pages +nginx_www_redirect: true # Implements an redirect from all www. domains to the main domain +execute_updates: true # Executes updates +force_backup_before_update: true # Activates the backup before the update procedure # Domain Names domain_akaunting: "akaunting.{{top_domain}}" diff --git a/roles/update-docker/templates/update-docker.service.j2 b/roles/update-docker/templates/update-docker.service.j2 index 7d5f30d5..dd189b0d 100644 --- a/roles/update-docker/templates/update-docker.service.j2 +++ b/roles/update-docker/templates/update-docker.service.j2 @@ -4,7 +4,7 @@ OnFailure=systemd-notifier@%n.service [Service] Type=oneshot -ExecStartPre=/bin/sh -c 'systemctl start backup-docker-to-local.service' +{% if force_backup_before_update | bool %}ExecStartPre=/bin/sh -c 'systemctl start backup-docker-to-local.service'{% endif %} ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_maintenance_service_freezer_script }} freeze "{{ system_maintenance_services | reject('equalto', "update-docker") | join(',') }}"' ExecStart=/bin/sh -c '/usr/bin/python {{update_docker_script}} {{path_docker_compose_instances}}' ExecStartPost=/bin/sh -c 'systemctl start system-maintenance-service-defrost.service' \ No newline at end of file