Merge branch 'version-2' into 'master'

add support dir-dbarchive

See merge request !4

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.

jobs/backup.job.dist

 # ----------------------------------------------------------------------
-# jobfile backup.job for schedulin
+#
+# jobfile backup.job for scheduling
 #
 # ----------------------------------------------------------------------
 #

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

jobs/transfer.job.dist

@@ -2,6 +2,8 @@
 #
 # jobfile for transfer of local data to backup-target
 #
+# ----------------------------------------------------------------------
+#
 # SYNTAX: 
 # [variable] = [value]
 #

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