diff --git a/group_vars/all b/group_vars/all index ff8ed9fe..342b842c 100644 --- a/group_vars/all +++ b/group_vars/all @@ -21,8 +21,8 @@ mode_setup: false # Execute the setup and initializing procedures # Server Tact Variables -## Ours in which the server is 100% working. Rest of the time is reserved for maintanance -hours_server_awake: "0..1,9..23" +## Ours in which the server is "awake" (100% working). Rest of the time is reserved for maintanance +hours_server_awake: "0..23" ## Random delay for systemd timers to avoid peak loads. randomized_delay_sec: "5min" diff --git a/roles/backup-data-to-usb/templates/backup-data-to-usb.service.j2 b/roles/backup-data-to-usb/templates/backup-data-to-usb.service.j2 index d089ac16..194774ce 100644 --- a/roles/backup-data-to-usb/templates/backup-data-to-usb.service.j2 +++ b/roles/backup-data-to-usb/templates/backup-data-to-usb.service.j2 @@ -4,6 +4,7 @@ Wants={{systemctl_mount_service_name}} OnFailure=systemd-notifier.cymais@%n.service [Service] +Type=oneshot ExecStart=/bin/python {{ backup_to_usb_script_path }} {{backup_to_usb_source}} {{backup_to_usb_destination}} ExecStartPost=/bin/systemctl start cleanup-backups.cymais.service diff --git a/roles/backup-docker-to-local/handlers/main.yml b/roles/backup-docker-to-local/handlers/main.yml index 498593d0..06980672 100644 --- a/roles/backup-docker-to-local/handlers/main.yml +++ b/roles/backup-docker-to-local/handlers/main.yml @@ -1,3 +1,8 @@ +- name: "reload backup-docker-to-local-everything.cymais.service" + systemd: + name: backup-docker-to-local-everything.cymais.service + daemon_reload: yes + - name: "reload backup-docker-to-local.cymais.service" systemd: name: backup-docker-to-local.cymais.service diff --git a/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 b/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 index e6806af4..5c4beff4 100644 --- a/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 +++ b/roles/backup-docker-to-local/templates/backup-docker-to-local-everything.service.j2 @@ -5,4 +5,5 @@ OnFailure=systemd-notifier.cymais@%n.service cleanup-failed-docker-backups.cymai [Service] Type=oneshot ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{ system_maintenance_backup_services | reject('equalto', 'backup-docker-to-local') | join(' ') }} --timeout "{{sytem_maintenance_lock_timeout_backup_services}}"' -ExecStart=/bin/sh -c '/usr/bin/python {{backup_docker_to_local_folder}}backup-docker-to-local.py --everything' \ No newline at end of file +ExecStart=/bin/sh -c '/usr/bin/python {{backup_docker_to_local_folder}}backup-docker-to-local.py --everything' +ExecStartPost=/bin/systemctl start heal-docker.cymais.service \ No newline at end of file diff --git a/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 b/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 index cdeba0f1..16dcf3d1 100644 --- a/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 +++ b/roles/backup-docker-to-local/templates/backup-docker-to-local.service.j2 @@ -5,4 +5,5 @@ OnFailure=systemd-notifier.cymais@%n.service cleanup-failed-docker-backups.cymai [Service] Type=oneshot ExecStartPre=/bin/sh -c '/usr/bin/python {{ path_system_lock_script }} {{ system_maintenance_services | join(' ') }} --ignore {{ system_maintenance_backup_services | reject('equalto', 'backup-docker-to-local-everything') | join(' ') }} --timeout "{{sytem_maintenance_lock_timeout_backup_services}}"' -ExecStart=/bin/sh -c '/usr/bin/python {{backup_docker_to_local_folder}}backup-docker-to-local.py' \ No newline at end of file +ExecStart=/bin/sh -c '/usr/bin/python {{backup_docker_to_local_folder}}backup-docker-to-local.py' +ExecStartPost=/bin/systemctl start heal-docker.cymais.service \ No newline at end of file