Implemented cleanup procedure for failed backups

roles/backups-consumer/handlers/main.yml

@@ -1,12 +1,11 @@
 - name: "reload pull-remote-backups service"
   systemd:
     name: pull-remote-backups.service
-    state: reloaded
     enabled: yes
     daemon_reload: yes
 - name: "restart pull-remote-backups timer"
   systemd:
     name: pull-remote-backups.timer
-    state: restarted
+    state: started
     enabled: yes
     daemon_reload: yes

roles/backups-consumer/meta/main.yml

@@ -2,3 +2,4 @@ dependencies:
   - git
   - systemd_notifier
   - backups-cleanup-timer
+  - docker-volume-backup-cleanup

roles/backups-consumer/templates/pull-remote-backups.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=pull remote backups
-OnFailure=systemd-notifier@%n.service
+OnFailure=systemd-notifier@%n.service docker-volume-backup-cleanup.service
 
 [Service]
 Type=oneshot

roles/docker-volume-backup-cleanup/README.md

@@ -0,0 +1,3 @@
+# Docker Volume Backup Cleanup
+This script cleans up failed docker backups.
+It uses https://github.com/kevinveenbirkenbach/docker-volume-backup-cleanup as base.

roles/docker-volume-backup-cleanup/handlers/main.yml

@@ -0,0 +1,5 @@
+- name: "reload docker-volume-backup-cleanup.service daemon"
+  systemd:
+    name: docker-volume-backup-cleanup.service
+    enabled: yes
+    daemon_reload: yes

roles/docker-volume-backup-cleanup/meta/main.yml

@@ -0,0 +1,3 @@
+dependencies:
+  - git
+  - systemd_notifier

roles/docker-volume-backup-cleanup/tasks/main.yml

@@ -0,0 +1,18 @@
+- name: pull docker-volume-backup-cleanup.git
+  git:
+    repo: "https://github.com/kevinveenbirkenbach/docker-volume-backup-cleanup.git"
+    dest: "{{docker_volume_backup_cleanup_folder}}"
+    update: yes
+  register: git_result
+  ignore_errors: true
+
+- name: Warn if repo is not reachable
+  debug:
+    msg: "Warning: Repository is not reachable."
+  when: git_result.failed
+
+- name: configure docker-volume-backup-cleanup.service
+  template: 
+    src: docker-volume-backup-cleanup.service.j2
+    dest: /etc/systemd/system/docker-volume-backup-cleanup.service
+  notify: reload docker-volume-backup-cleanup.service daemon

roles/docker-volume-backup-cleanup/templates/docker-volume-backup-cleanup.service.j2

@@ -0,0 +1,7 @@
+[Unit]
+Description=Cleans up failed docker volume backups
+OnFailure=systemd-notifier@%n.service
+
+[Service]
+Type=oneshot
+ExecStart=/bin/sh -c '/usr/bin/yes | /usr/bin/bash {{docker_volume_backup_cleanup_folder}}cleanup.sh {{docker_volume_backup_cleanup_machine_id}} {{docker_volume_backup_cleanup_trigger_directory}}'

roles/docker-volume-backup-cleanup/vars/main.yml

@@ -0,0 +1 @@
+docker_volume_backup_cleanup_folder: "{{path_administrator_scripts}}docker-volume-backup-cleanup/"

roles/docker-volume-backup/handlers/main.yml

@@ -1,12 +1,12 @@
 - name: "reload docker-volume-backup.service"
   systemd:
     name: docker-volume-backup.service
-    state: reloaded
     enabled: yes
     daemon_reload: yes
+
 - name: "restart docker-volume-backup.timer"
   systemd:
     name: docker-volume-backup.timer
-    state: restarted
+    state: started
     enabled: yes
     daemon_reload: yes

roles/docker-volume-backup/meta/main.yml

@@ -2,3 +2,4 @@ dependencies:
   - git
   - backups-provider
   - systemd_notifier
+  - docker-volume-backup-cleanup

roles/docker-volume-backup/templates/docker-volume-backup.service.j2

@@ -1,6 +1,6 @@
 [Unit]
 Description=docker volume backup
-OnFailure=systemd-notifier@%n.service
+OnFailure=systemd-notifier@%n.service docker-volume-backup-cleanup.service
 
 [Service]
 Type=oneshot