From 69acd7f53694b96059c01251d0c281fb8e69f29e Mon Sep 17 00:00:00 2001
From: Michael Grote <38253905+quotengrote@users.noreply.github.com>
Date: Sun, 10 Jan 2021 16:10:24 +0100
Subject: [PATCH] Format: date angepasst(restic/sanoid)

---
 roles/mgrote.restic/templates/restic_backup.sh | 6 +++---
 roles/mgrote.sanoid/templates/sanoid-cron.sh   | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/roles/mgrote.restic/templates/restic_backup.sh b/roles/mgrote.restic/templates/restic_backup.sh
index d4cfb231..9a19c457 100644
--- a/roles/mgrote.restic/templates/restic_backup.sh
+++ b/roles/mgrote.restic/templates/restic_backup.sh
@@ -21,7 +21,7 @@ mount_return_value=$? # schreib Exit Code in Variable
 if ( [ "$mount_return_value" -ne 0 ] ); then
     {
     echo "--------------------------------------------------" # Trenner logfile
-    echo $(date) # Datum für logfile
+    echo $(date +%d.%m.%Y-%T) # Datum für logfile
     echo "mount error"
     } >> /var/log/restic.log 2>&1;
     tail --lines=5 "/var/log/restic.log" | mail -s "Backup-Error - restic - $HOSTNAME" {{ empfaenger_mail }}
@@ -29,7 +29,7 @@ if ( [ "$mount_return_value" -ne 0 ] ); then
 else
     {
     echo "--------------------------------------------------" # Trenner logfile
-    echo $(date) # Datum für logfile
+    echo $(date +%d.%m.%Y-%T) # Datum für logfile
     echo "mount successful"
     } >> /var/log/restic.log 2>&1;
 fi
@@ -40,7 +40,7 @@ while [[ "$abbruch_restic" -le {{ restic_anzahl_versuche_backup }} ]] # Schleife
 do
     {  # ist keine Subshell sondern Grouping; https://askubuntu.com/questions/662190/write-the-output-of-multiple-sequential-commands-to-a-text-file
     echo "--------------------------------------------------" # Trenner logfile
-    echo $(date) # Datum für logfile
+    echo $(date +%d.%m.%Y-%T) # Datum für logfile
     restic -r {{ restic_mount }} --password-file /etc/restic/password.txt backup --exclude-file /etc/restic/exclude.txt {{ restic_folders_to_backup }} # execute Backup
     restic_return_value=$? # schreib Exit Code in Variable
     if ( [[ "$restic_return_value" -eq 0 ]] ); # Prüfung ob restic erfolgreich war(setze Abbruchbedingung), wenn nicht warte 1min und zähle die Abbruchbedingung hoch
diff --git a/roles/mgrote.sanoid/templates/sanoid-cron.sh b/roles/mgrote.sanoid/templates/sanoid-cron.sh
index e165ef57..3d6b01bb 100644
--- a/roles/mgrote.sanoid/templates/sanoid-cron.sh
+++ b/roles/mgrote.sanoid/templates/sanoid-cron.sh
@@ -23,12 +23,11 @@ exlock
 
 (
   echo "--------------------------------------------------"
-  echo $(date) sanoid start
+  echo $(date +%d.%m.%Y-%T) sanoid start
   echo ""
   /usr/local/bin/sanoid --cron --verbose
   echo ""
-  echo $(date) sanoid end
-  echo "--------------------------------------------------"
+  echo $(date +%d.%m.%Y-%T) sanoid end
 ) >> /var/log/sanoid-cron.log 2>&1 &