From 02934c1e1f9f277547ac447cf49bfb15aae9e78e Mon Sep 17 00:00:00 2001
From: Alex Toff <me@alextoff.uk>
Date: Mon, 14 Aug 2023 19:16:45 +0100
Subject: [PATCH] apply to full dump too. include DB name

---
 postgres-backup-s3/backup.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/postgres-backup-s3/backup.sh b/postgres-backup-s3/backup.sh
index b42b3aa..4ae6cff 100644
--- a/postgres-backup-s3/backup.sh
+++ b/postgres-backup-s3/backup.sh
@@ -65,6 +65,10 @@ fi
 if [ "${POSTGRES_BACKUP_ALL}" == "true" ]; then
   SRC_FILE=dump.sql.gz
   DEST_FILE=all_$(date +"%Y-%m-%dT%H:%M:%SZ").sql.gz
+  
+  if [ "${S3_FILE_NAME}" != "**None**" ]; then
+    DEST_FILE=${S3_FILE_NAME}.sql.gz
+  fi
 
   echo "Creating dump of all databases from ${POSTGRES_HOST}..."
   pg_dumpall -h $POSTGRES_HOST -p $POSTGRES_PORT -U $POSTGRES_USER | gzip > $SRC_FILE
@@ -96,7 +100,7 @@ else
     DEST_FILE=${DB}_$(date +"%Y-%m-%dT%H:%M:%SZ").sql.gz
 
     if [ "${S3_FILE_NAME}" != "**None**" ]; then
-      DEST_FILE=${S3_FILE_NAME}.sql.gz
+      DEST_FILE=${S3_FILE_NAME}_${DB}.sql.gz
     fi
     
     echo "Creating dump of ${DB} database from ${POSTGRES_HOST}..."