From cbc1a4ef4ae09d666a72558c394f5dc3d8f243af Mon Sep 17 00:00:00 2001
From: Bilbo Baggins <bilbo_b@qlch.de>
Date: Tue, 25 Jun 2024 17:11:55 +0200
Subject: [PATCH] initial commit for restic.sh, change DATEFMT for
 backup-yunohost.sh

---
 backup-yunohost.sh | 11 ++++++-----
 restic.sh          |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 restic.sh

diff --git a/backup-yunohost.sh b/backup-yunohost.sh
index 0bdcf5b..82dcea4 100755
--- a/backup-yunohost.sh
+++ b/backup-yunohost.sh
@@ -6,15 +6,16 @@ TARGET=/yunohost-backups
 HOST=yunohost
 TODAY_DATE=$(date '+%F')
 LOGFILE=${TARGET}/$TODAY_DATE.$$.log
+DATEFMT="+%d.%m.%y %H:%M:%S"
 ERR=0
 NUMRETAINBACKUPS=10
 
-echo "yunohost backup begin $(date):" >$LOGFILE
+echo "yunohost backup begin $(date "${DATEFMT}"):" >$LOGFILE
 #date >>$LOGFILE
 # delete max. 3 old backups per run
 for i in 1 2 3
 do
-	NUMBACKUPS=$(ssh ${HOST} sudo yunohost backup list | grep -- '-' | wc -l) || { echo yunohost could not list backups $(date) >>$LOGFILE ; exit 1; }
+	NUMBACKUPS=$(ssh ${HOST} sudo yunohost backup list | grep -- '-' | wc -l) || { echo yunohost could not list backups $(date "${DATEFMT}") >>$LOGFILE ; exit 1; }
 #	ERR=$?
 #	if [ ${ERR} -ne 0 ]
 #	then
@@ -49,14 +50,14 @@ echo "starting gitea service on ${HOST}"  &>>$LOGFILE
 ssh ${HOST} sudo systemctl start gitea.service &>>$LOGFILE 
 
 echo "yunohost backup ended:" >>$LOGFILE
-date >>$LOGFILE
+date "${DATEFMT}" >>$LOGFILE
 BACKUPFILE=$(ssh ${HOST} sudo yunohost backup list --with-info -H  | grep -A 3 $TODAY_DATE |  grep 'path:' | cut -d":" -f2 | tr -d " " | tail -1)
 scp ${HOST}:${BACKUPFILE} ${TARGET} && echo "${BACKUPFILE} successfully copied to ${TARGET}!" &>>$LOGFILE || echo "error when trying to scp ${BACKUPFILE} to ${TARGET}!" &>>$LOGFILE 
 ls -lisah ${TARGET}/`basename ${BACKUPFILE}` >>$LOGFILE
 gzip -9 ${TARGET}/`basename ${BACKUPFILE}` &>>$LOGFILE
 ls -lisah ${TARGET}/`basename ${BACKUPFILE}`.gz &>>$LOGFILE 
 source /root/.bashrc
-echo restic backup on ${HOST} at $(date) &>>${LOGFILE} 
+echo restic backup on ${HOST} at $(date "${DATEFMT}") &>>${LOGFILE} 
 #ssh ${HOST} sudo { source /root/.bashrc ; /usr/bin/restic backup /home/yunohost.backup/archives ; } &>>$LOGFILE
 ssh ${HOST} "sudo /root/bin/restic.sh" &>>$LOGFILE
 restic check --read-data-subset 20% &>>$LOGFILE
@@ -108,7 +109,7 @@ echo space in filesys of ${TARGET} after pruning backups &>>$LOGFILE
 df -h ${TARGET} &>>$LOGFILE
 
 echo "$0 on `hostname` ended:" >>$LOGFILE
-date >>$LOGFILE
+date "${DATEFMT}">>$LOGFILE
 # Achtung, hier wird es kompliziert :) nach diesem Kommando keine Umleitung in $LOGFILE mehr
 mv ${LOGFILE} ${TARGET}/`basename ${BACKUPFILE} .tar`.log
 gzip -9 ${TARGET}/`basename ${BACKUPFILE} .tar`.log 
diff --git a/restic.sh b/restic.sh
new file mode 100644
index 0000000..9f9b825
--- /dev/null
+++ b/restic.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+#LOGFILE=/home/admi/restic.log
+DATEFMT="+%d.%m.%y %H:%M:%S"
+source /root/.bashrc 
+echo restic backup on $(hostname) at $(date "${DATEFMT}")
+/usr/bin/restic backup /home/yunohost.backup/archives