From 6e8620a587a7f848f7566f837c9de6bdfa6c2e92 Mon Sep 17 00:00:00 2001
From: Dave Conroy <dave@tiredofit.ca>
Date: Thu, 16 Nov 2017 09:02:39 -0800
Subject: [PATCH] 1.31 - Fix PSQL SPLIT_DB Backup

---
 CHANGELOG.md                             | 4 ++++
 install/etc/s6/services/10-db-backup/run | 5 ++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 058c099..4b91792 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.1 - 2017-11-17 - <dave at tiredofit dot ca>
+
+* Fix to SPLIT_DB Postgresql Backup
+
 ## 1.3 - 2017-10-25 - <dave at tiredofit dot ca>
 
 * Remove Alpine postgres package and recompile version 10
diff --git a/install/etc/s6/services/10-db-backup/run b/install/etc/s6/services/10-db-backup/run
index 7590cef..26d8b63 100755
--- a/install/etc/s6/services/10-db-backup/run
+++ b/install/etc/s6/services/10-db-backup/run
@@ -124,12 +124,11 @@ function backup_mongo() {
 
 function backup_pgsql() {
   if [ "$SPLIT_DB" = "TRUE" ] || [ "$SPLIT_DB" = "true" ];  then   
-      DATABASES=$( ${POSTGRES_PASS_STR} psql -h $DBHOST -U $DBUSER -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' )
+      export PGPASSWORD=${DBPASS}
+      DATABASES=psql -h $DBHOST -U $DBUSER -c 'COPY (SELECT datname FROM pg_database WHERE datistemplate = false) TO STDOUT;' )
             for db in $DATABASES; do
                 echo "** [db-backup] Dumping database: $db"
                 TARGET=pgsql_${db}_${DBHOST}_${now}.sql
-                export PGPASSWORD=${DBPASS}
-
                 pg_dump -h ${DBHOST} -p ${DBPORT}-U ${DBUSER} $db > ${TMPDIR}/${TARGET}
                 generate_md5
                 compression