From 9d498636a95fce15d713e1be71155415acae60d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorben=20G=C3=BCnther?= <admin@xenrox.net>
Date: Wed, 18 May 2022 13:28:48 +0200
Subject: [PATCH] borg: Improve backup script

set -e, only install docker backup script if there are docker services.
---
 roles/borg/tasks/main.yml              | 2 +-
 roles/borg/templates/borg-backup.sh.j2 | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/roles/borg/tasks/main.yml b/roles/borg/tasks/main.yml
index cd01fbb..b4c2439 100644
--- a/roles/borg/tasks/main.yml
+++ b/roles/borg/tasks/main.yml
@@ -116,4 +116,4 @@
     owner: root
     group: root
     mode: 0755
-  when: docker_services is defined
+  when: docker_services is defined and docker_services is iterable
diff --git a/roles/borg/templates/borg-backup.sh.j2 b/roles/borg/templates/borg-backup.sh.j2
index 21a48e3..6bba2cb 100644
--- a/roles/borg/templates/borg-backup.sh.j2
+++ b/roles/borg/templates/borg-backup.sh.j2
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 export BORG_REPO=ssh://{{ borg_user }}@{{ borg_user }}.your-storagebox.de:23/./borg
 export BORG_PASSCOMMAND='cat /etc/.secrets/borg.pass'
 
@@ -29,7 +31,7 @@ fi
 backup-sqlite.sh
 {% endif %}
 
-{% if docker_services is defined %}
+{% if docker_services is defined and docker_services is iterable %}
 backup-docker.sh
 {% endif %}
 
-- 
2.44.0