Improved cron/forget scripts

.autorestic.yml

@@ -113,6 +113,17 @@ locations:
     - glacier
     cron: '0 3 * * 4' # At 3:00am on Thursday
 
+  bookstack:
+    from:
+    - /var/www/bookstack/.env
+    - /var/www/bookstack/public/uploads
+    - /var/www/bookstack/storage/uploads
+    to:
+    - hdd
+    - oiseauroch
+    - glacier
+    cron: '0 3 * * 4' # At 3:00am on Thursday
+
   mail:
     from:
     - /var/mail

runcron

@@ -1,13 +1,13 @@
 #! /usr/bin/env bash
-autorestic -c /etc/autorestic/.autorestic.yml --ci cron --lean 1> /tmp/autorestic.log 2>/tmp/autorestic-err.log
+autorestic -c /etc/autorestic/.autorestic.yml --ci cron 1> /tmp/autorestic.log 2>/tmp/autorestic-err.log
 ret=$?
 
-if [ "$ret" != 0 ] || [ -s /tmp/autorestic-err.log ]
+if [[ "$ret" != 0  ||  -s /tmp/autorestic-err.log ]]
 then
-        cat <(echo -e "Command failed with return code $ret and log:") /tmp/autorestic-err.log | mail -s "Autorestic Backup: Failed" root
+        cat <(echo "Command failed with return code $ret and log:") /tmp/tmp/autorestic-err.log <(echo "===============") /tmp/autorestic.log | mail -s "Autorestic Backup: Failed" root
 else
-	if [ $(wc -l < /tmp/autorestic.log) -gt 3 ]
+	if [[ $(wc -l < /tmp/autorestic.log) -gt 15 ]]
 	then
-        	cat <(echo -e "Command successfully finished with the following log:") /tmp/autorestic.log | mail -s "Autorestic Backup: Success" root
+        	cat <(echo -e "Command successfully finished with the following log:") /tmp/tmp/autorestic-err.log <(echo "===============") /tmp/autorestic.log | mail -s "Autorestic Backup: Success" root
 	fi
 fi

runforget

@@ -2,9 +2,9 @@
 autorestic -c /etc/autorestic/.autorestic.yml --ci forget --all --prune 1> /tmp/autorestic-prune.log 2>/tmp/autorestic-prune-err.log
 ret=$?
 
-if [ "$ret" != 0 ] || [ -s /tmp/autorestic-prune-err.log ]
+if [[ "$ret" != 0 || -s /tmp/autorestic-prune-err.log ]]
 then
-	cat <(echo -e "Command failed with return code $ret and log:") /tmp/autorestic-prune-err.log | mail -s "Autorestic Pruning: Failed" root
+	cat <(echo "Command failed with return code $ret and log:") /tmp/autorestic-prune-err.log <(echo "===============") /tmp/autorestic-prune.log | mail -s "Autorestic Pruning: Failed" root
 else
-	cat <(echo -e "Command successfully finished with the following log:") /tmp/autorestic-prune.log | mail -s "Autorestic Pruning: Success" root
+	cat <(echo "Command successfully finished with the following log:") /tmp/autorestic-prune.log | mail -s "Autorestic Pruning: Success" root
 fi