From 1afca6be94d139076f379ae0fc659b6f6f4fc8cd Mon Sep 17 00:00:00 2001
From: Jef Roosens <roosensjef@gmail.com>
Date: Thu, 11 Jan 2024 10:44:11 +0100
Subject: [PATCH] restic: backup scripts should use absolute paths

---
 roles/lander/files/lander.backup.sh     | 2 +-
 roles/restic/tasks/main.yml             | 2 +-
 roles/restic/templates/backup-all.sh.j2 | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/roles/lander/files/lander.backup.sh b/roles/lander/files/lander.backup.sh
index 9b9ecb1..ec8b3f9 100644
--- a/roles/lander/files/lander.backup.sh
+++ b/roles/lander/files/lander.backup.sh
@@ -6,7 +6,7 @@ snapshot_dir="${data_dir}.snapshot"
 # Read-only snapshot for atomic backup
 btrfs subvolume snapshot -r "$data_dir" "$snapshot_dir" || exit $?
 
-restic backup "$snapshot_dir"
+/usr/local/bin/restic backup "$snapshot_dir"
 
 # Always remove snapshot subvolume, even if restic fails
 btrfs subvolume delete "$snapshot_dir"
diff --git a/roles/restic/tasks/main.yml b/roles/restic/tasks/main.yml
index 6d2e722..4c0ae1d 100644
--- a/roles/restic/tasks/main.yml
+++ b/roles/restic/tasks/main.yml
@@ -53,4 +53,4 @@
     name: 'Perform nightly backups'
     minute: '0'
     hour: '2'
-    job: 'bash /etc/backups/backup-all.sh'
+    job: '/usr/bin/bash /etc/backups/backup-all.sh'
diff --git a/roles/restic/templates/backup-all.sh.j2 b/roles/restic/templates/backup-all.sh.j2
index 5200aaa..e5de777 100644
--- a/roles/restic/templates/backup-all.sh.j2
+++ b/roles/restic/templates/backup-all.sh.j2
@@ -9,9 +9,9 @@ export RESTIC_REPOSITORY='rest:http://{{ groups['nas'][0] }}:8000/backups'
 export RESTIC_PASSWORD_FILE='/etc/backups/restic_backups_passwd'
 
 for script in $(find /etc/backups -name '*.backup.sh'); do
-    bash "$script"
+    /usr/bin/bash "$script"
 done
 
 # Prune older backups
-restic forget --keep-last 7 && \
-    restic prune
+/usr/local/bin/restic forget --keep-last 7 && \
+    /usr/local/bin/restic prune