From 56cdc39d7b24972c38fb0d03b2b62c4f4e79a2a3 Mon Sep 17 00:00:00 2001
From: Tommaso Piccioli <tommaso.piccioli@isti.cnr.it>
Date: Thu, 23 Mar 2023 16:15:08 +0100
Subject: [PATCH] Update 'templates/postgresql-backup.sh.j2'

- Cleanup older dumps leaving N_DAYS_TO_SPARE dump, don't use find by date
- clean old dumps before new dump
---
 templates/postgresql-backup.sh.j2 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/templates/postgresql-backup.sh.j2 b/templates/postgresql-backup.sh.j2
index 082fdde..a1c8e3e 100755
--- a/templates/postgresql-backup.sh.j2
+++ b/templates/postgresql-backup.sh.j2
@@ -46,12 +46,13 @@ create_backup_dirs() {
 
 cleanup_old_backups() {
 	# Remove the old backups
-	find ${HISTDIR} -mtime +${N_DAYS_TO_SPARE} -type f -exec rm -fv {} \;
-	# TODELETE=$( /bin/ls "${HISTDIR}/" | awk -F '.' '{print $NF}' | sort -ruV | tail -n +${N_DAYS_TO_SPARE} )
-	# for i in ${TODELETE}
-	# do
-	#     rm -f "${HISTDIR}/*.${i}"
-	# done
+	# 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}
+	do
+	    rm -f "${HISTDIR}/*.${i}"
+	done
 }
 
 create_db_list() {
@@ -118,6 +119,8 @@ fix_backup_permissions() {
 #
 umask 0077
 
+cleanup_old_backups
+
 create_backup_dirs
 if [ "$BUILD_DBLIST" == "yes" ] ; then
 	create_db_list
@@ -150,6 +153,5 @@ else
 fi
 
 fix_backup_permissions
-cleanup_old_backups
 
 exit $RETVAL