From 517739f5b53eee517018d56018ea540d43a56a85 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@iml.unibe.ch>
Date: Thu, 14 Apr 2022 12:51:39 +0200
Subject: [PATCH] move sequence and security file on delete
---
plugins/localdump/couchdb2.sh | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/plugins/localdump/couchdb2.sh b/plugins/localdump/couchdb2.sh
index 937ff80..c498139 100755
--- a/plugins/localdump/couchdb2.sh
+++ b/plugins/localdump/couchdb2.sh
@@ -143,12 +143,12 @@ function doBackup(){
function _doBackupOfSingleInstance(){
create_targetdir
- mkdir -p "${BACKUP_TARGETDIR}/${COUCHDB_INSTANCE}" 2>/dev/null
- mkdir -p "${ARCHIVE_DIR}/${COUCHDB_INSTANCE}/seq" 2>/dev/null
- mkdir -p "${ARCHIVE_DIR}/${COUCHDB_INSTANCE}/security" 2>/dev/null
-
local ARCHIVE_DIR2="${ARCHIVE_DIR}/${COUCHDB_INSTANCE}/deleted_databases"
- test -d "${ARCHIVE_DIR2}" || mkdir -p "${ARCHIVE_DIR2}" 2>/dev/null
+ for _dir in "${BACKUP_TARGETDIR}/${COUCHDB_INSTANCE}" "${ARCHIVE_DIR}/${COUCHDB_INSTANCE}/seq" "${ARCHIVE_DIR}/${COUCHDB_INSTANCE}/security" \
+ "${ARCHIVE_DIR2}" "${ARCHIVE_DIR2}/seq" "${ARCHIVE_DIR2}/security"
+ do
+ test -d "$_dir" || (echo "creating $_dir" ; mkdir -p "$_dir" )
+ done
echo
echo " MOVE deleted databases into ${ARCHIVE_DIR2}"
@@ -165,9 +165,11 @@ function _doBackupOfSingleInstance(){
dbname=$( basename $dumpfile | sed "s#\.couchdbdump\.gz##g" )
if ! grep "^${dbname}" "$dblist" >/dev/null; then
SEQFILE=${ARCHIVE_DIR}/${COUCHDB_INSTANCE}/seq/__seq__${dbname}
+ SECURITYFILE=${ARCHIVE_DIR}/${COUCHDB_INSTANCE}/security/__security__${dbname}.json
echo "DELETED $dbname ... $( ls -l ${dumpfile} | cut -f 5- -d ' ' )"
- mv "${dumpfile}" "${ARCHIVE_DIR2}"
- rm -f "${SEQFILE}"
+ mv "${dumpfile}" "${ARCHIVE_DIR2}"
+ mv "${SEQFILE}" "${ARCHIVE_DIR2}/seq/"
+ mv "${SECURITYFILE}" "${ARCHIVE_DIR2}/security/"
fi
done
# done | tee /tmp/couch_archive_${COUCHDB_INSTANCE}.txt
--
GitLab