From 3f138368d7823d23baa7a3b3aaa605bc2dc72fc8 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@iml.unibe.ch>
Date: Mon, 31 May 2021 15:03:07 +0200
Subject: [PATCH] add support for db-dirarchive
---
jobhelper.sh | 1 +
jobs/dirs.job.dist | 5 ++++-
transfer.sh | 6 ++++--
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/jobhelper.sh b/jobhelper.sh
index 6b895c1..9c13a06 100755
--- a/jobhelper.sh
+++ b/jobhelper.sh
@@ -122,6 +122,7 @@ function j_getDirs2Backup(){
STORAGE_SAMBASHARES=`_j_getvar ${STORAGEFILE} "sambashares"`
_j_getvar ${DIRFILE} dir-localdumps
+ _j_getvar ${DIRFILE} dir-dbarchive
_j_getvar ${DIRFILE} include
# get dirs of filesets, i.e.
diff --git a/jobs/dirs.job.dist b/jobs/dirs.job.dist
index cb23fb9..5670bd6 100644
--- a/jobs/dirs.job.dist
+++ b/jobs/dirs.job.dist
@@ -21,9 +21,12 @@
# each datbase service has its own subdir there
# this entry is mapped to BACKUP_TARGETDIR in "localdump.sh"
# ----------------------------------------------------------------------
-dir-localdumps = /var/_unibe_iml/backup
+dir-localdumps = /var/localdumps/backup
keep-days = 7
+# archive databases (to keep deleted schemes or databases that
+# are not backupped anymore; couchdb2 feature)
+dir-dbarchive = /var/localdumps/archive
# ----------------------------------------------------------------------
# directory list to transfer
diff --git a/transfer.sh b/transfer.sh
index 35cf788..4d9c980 100755
--- a/transfer.sh
+++ b/transfer.sh
@@ -46,6 +46,7 @@
PASSPHRASE=`_j_getvar ${STORAGEFILE} "passphrase"`
STORAGE_REGISTER=`_j_getvar ${STORAGEFILE} "storage-register"`
+ typeset -i TIMER_TRANSFER_START=`date +%s`
# check
if [ -z "$STORAGE_BIN" ]; then
@@ -221,7 +222,7 @@
h2 "`date` PRE transfer tasks"
t_backupDoPreTasks
-
+ echo
# --------------------------------------------------------------------------------
# ----- START BACKUPS
@@ -344,7 +345,8 @@
fi
color reset
echo | tee -a $transferlog
- echo `date` TRANSFER DONE | tee -a $transferlog
+ typeset -i TIMER_TRANSFER=`date +%s`-$TIMER_TRANSFER_START
+ echo `date` TRANSFER DONE in $TIMER_TRANSFER sec | tee -a $transferlog
ls -l $transferlog
exit $rc
--
GitLab