From c9aa64f79a02b258438c74f4c687cad1b7d2b8a4 Mon Sep 17 00:00:00 2001 From: Tommaso Piccioli Date: Fri, 24 Mar 2023 19:01:45 +0100 Subject: [PATCH 1/3] Update 'templates/postgresql-backup.sh.j2' --- templates/postgresql-backup.sh.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/postgresql-backup.sh.j2 b/templates/postgresql-backup.sh.j2 index a1c8e3e..277c575 100755 --- a/templates/postgresql-backup.sh.j2 +++ b/templates/postgresql-backup.sh.j2 @@ -49,9 +49,9 @@ cleanup_old_backups() { # find ${HISTDIR} -mtime +${N_DAYS_TO_SPARE} -type f -exec rm -fv {} \; ORD_DUMP_TO_DEL=$( expr $N_DAYS_TO_SPARE + 1 ) TODELETE=$( /bin/ls "${HISTDIR}/" | awk -F '.' '{print $NF}' | sort -ruV | tail -n +${ORD_DUMP_TO_DEL} ) - for i in ${TODELETE} + for DATETODELETE in ${TODELETE} do - rm -f "${HISTDIR}/*.${i}" + rm -fv "${DATETODELETE}/*.${i}" done } From a4ceaaf5b2fe1423c98165168843033f0a76f54b Mon Sep 17 00:00:00 2001 From: Tommaso Piccioli Date: Fri, 24 Mar 2023 19:05:12 +0100 Subject: [PATCH 2/3] revert c9aa64f79a02b258438c74f4c687cad1b7d2b8a4 revert Update 'templates/postgresql-backup.sh.j2' --- templates/postgresql-backup.sh.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/postgresql-backup.sh.j2 b/templates/postgresql-backup.sh.j2 index 277c575..a1c8e3e 100755 --- a/templates/postgresql-backup.sh.j2 +++ b/templates/postgresql-backup.sh.j2 @@ -49,9 +49,9 @@ cleanup_old_backups() { # find ${HISTDIR} -mtime +${N_DAYS_TO_SPARE} -type f -exec rm -fv {} \; ORD_DUMP_TO_DEL=$( expr $N_DAYS_TO_SPARE + 1 ) TODELETE=$( /bin/ls "${HISTDIR}/" | awk -F '.' '{print $NF}' | sort -ruV | tail -n +${ORD_DUMP_TO_DEL} ) - for DATETODELETE in ${TODELETE} + for i in ${TODELETE} do - rm -fv "${DATETODELETE}/*.${i}" + rm -f "${HISTDIR}/*.${i}" done } From 8b13a1377cfeba64cb0a6a471d88f5e8ed47dd56 Mon Sep 17 00:00:00 2001 From: Tommaso Piccioli Date: Fri, 24 Mar 2023 19:07:57 +0100 Subject: [PATCH 3/3] Update 'templates/postgresql-backup.sh.j2' --- templates/postgresql-backup.sh.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/postgresql-backup.sh.j2 b/templates/postgresql-backup.sh.j2 index a1c8e3e..287974e 100755 --- a/templates/postgresql-backup.sh.j2 +++ b/templates/postgresql-backup.sh.j2 @@ -49,9 +49,9 @@ cleanup_old_backups() { # find ${HISTDIR} -mtime +${N_DAYS_TO_SPARE} -type f -exec rm -fv {} \; ORD_DUMP_TO_DEL=$( expr $N_DAYS_TO_SPARE + 1 ) TODELETE=$( /bin/ls "${HISTDIR}/" | awk -F '.' '{print $NF}' | sort -ruV | tail -n +${ORD_DUMP_TO_DEL} ) - for i in ${TODELETE} + for DATETODELETE in ${TODELETE} do - rm -f "${HISTDIR}/*.${i}" + rm -fv ${HISTDIR}/*.${DATETODELETE} done }