make a two-staged backup process, first downloading to a local dir

config.cfg.sample

@@ -4,11 +4,8 @@
 # File with hosts and their backup source paths
 HOSTS="$CURDIR"/hosts.csv
 
-# Temporary download destination for backups
-TEMPDIR=/tmp/uberspace-backup
-
 # root dir where backups shall be saved to
-BACKUPDIR=/mnt/remotesrv/uberspace
+BACKUPDIR=/var/backups/uberspace
 
 # GPG fingerprint of key used for encryption  
 GPG=6775E8DDD8CEABCC83E38CEHE6334BCA29DF8192
@@ -18,6 +15,3 @@ MAXBAK=3
 
 # SSH key
 #SSH_KEY="~/.ssh/mykey_rsa"
-
-# Logfile. Default: $CURDIR/backup.log
-# LOG_FILE=/var/log/uberspace-backup.log

ssh-checker.sh

@@ -68,4 +68,6 @@ while read -r line; do
     echo "[SUCCESS] SSH login possible for ${RHOST}."
   fi
 
+  echo
+
 done < "$HOSTS"

uberspace-backup.sh

@@ -9,15 +9,9 @@
 #
 ########################################################################
 
-# Fail fast on errors
-set -Eeuo pipefail
-
 # Set correct UTF-8 encoding (for FreeBSD jail)
 export LC_ALL=en_US.UTF-8
 
-# Initialise variables
-LOG_FILE=
-
 CURDIR=$(dirname "$(readlink -f "$0")")
 if [ ! -e "$CURDIR"/config.cfg ]; then echo "Missing config.cfg file. Edit and rename config.cfg.sample"; exit 1; fi
 source "$CURDIR"/config.cfg
@@ -32,13 +26,11 @@ else
   SSH_KEY=~/.ssh/id_rsa
 fi
 
-if [ -z "${LOG_FILE}" ]; then
+ARG1="$1"
-  # defaults
-  LOG_FILE="$CURDIR"/backup.log
-fi
 
 # Get current date
 DATE=$(date +"%Y-%m-%d_%H-%M")
+LOG="$CURDIR"/backup.log
 
 function trim {
   sed -r -e 's/^[[:space:]]*//g' -e 's/[[:space:]]*$//g'
@@ -50,18 +42,17 @@ function pdate {
 function logecho {
   # Echo string and copy it to log while attaching the current date
   echo "$(pdate) $*"
-  echo "$(pdate) $*" >> "$LOG_FILE"
+  echo "$(pdate) $*" >> "$LOG"
 }
 
-# Loop over all hosts
 while read -r line; do
   # if line is a comment or blank, go to next line
   if echo "$line" | grep -qE "^\s*(#|$)"; then continue; fi
 
   RHOST=$(echo "$line" | cut -d";" -f1 | trim)
 
-  # Jump to next line if this line's host does not match host of first argument (if given)
+  # Jump to next line if this line's host does not match host of ARG1 (if given)
-  if [[ "${1-}" != "" ]] && [[ "${1-}" != "${RHOST}" ]]; then
+  if [[ "${ARG1}" != "" ]] && [[ "${ARG1}" != "${RHOST}" ]]; then
     continue
   fi
   # Task ssh-checker.sh to check this host
@@ -88,10 +79,7 @@ while read -r line; do
 
   logecho "${RHOST}: Starting backups"
 
-  logecho "${RHOST}: Deleting host's temporary directories in ${TEMPDIR}"
+  NORDIR=$(echo "$ALLRDIR" | grep -o "|" | wc -l)
-  rm -rf "${TEMPDIR:?}/${RHOST:?}/"*
-
-  NORDIR=$(echo "$ALLRDIR" | grep -o "|" | wc -l || true)
   NORDIR=$(($NORDIR + 1))
 
   # Loop through all backup sources
@@ -119,9 +107,12 @@ while read -r line; do
     # Example:
     #   DEST=/tmp/uberspace-backup/user@example.com/2019-01-01/virtual
     #   DEST_FINAL=/media/Uberspace/user@example.com/2019-01-01/
-    DEST="${TEMPDIR}/${DEST_REL}"
+    DEST="${TEMPDIR}/${DEST}"
     DEST_FINAL="$(dirname "${BACKUPDIR}/${DEST_REL}")"
 
+    logecho "DEBUG: $DEST"
+    logecho "DEBUG: $DEST_FINAL"
+
     # Set Source directory, and make exception for %mysql
     SOURCE="${RDIR}"
     if [ "${RDIR}" == "mysql" ]; then
@@ -152,17 +143,15 @@ while read -r line; do
 
     # Push encrypted backup to final backup destination
     logecho "${RHOST}: Moving $(basename "${DEST}") to ${DEST_FINAL}"
-    cp "${DEST}".tar.gpg "${DEST_FINAL}/"
+    mv "${DEST}".tar.gpg "${DEST_FINAL}/"
-    rm "${DEST}".tar.gpg
 
-  done # End of loop through all backup sources
+    # Delete all old directories except the $MAXBAK most recent
-
+    if [ $(ls -tp "${BACKUPDIR}"/"${RHOST}"/ | grep '/$' | wc -l | tr -d ' ') -gt $MAXBAK ]; then
-  # Delete all old directories except the $MAXBAK most recent
+      oldbackups=$(ls -tp "${BACKUPDIR}"/"${RHOST}"/ | grep '/$' | tail -n +$(($MAXBAK + 1)))
-  if [ $(ls -tp "${BACKUPDIR}"/"${RHOST}"/ | grep '/$' | wc -l | tr -d ' ') -gt $MAXBAK ]; then
+      logecho "${RHOST}: Removing older backups of $(basename "${DEST}"): ${oldbackups}"
-    oldbackups=$(ls -tp "${BACKUPDIR}"/"${RHOST}"/ | grep '/$' | tail -n +$(($MAXBAK + 1)))
+      ls -tpd "${BACKUPDIR}"/"${RHOST}"/* | grep '/$' | tail -n +$(($MAXBAK + 1)) | xargs -0 | xargs rm -r --
-    logecho "${RHOST}: Removing older backup directories: ${oldbackups}"
+    fi
-    ls -tpd "${BACKUPDIR}"/"${RHOST}"/* | grep '/$' | tail -n +$(($MAXBAK + 1)) | xargs -0 | xargs rm -r --
+  done
-  fi
 
 done < "$HOSTS"