From 3008d9125fe008561850dce2bfbe54e16215ee3b Mon Sep 17 00:00:00 2001
From: Tom Pansino <2768420+tpansino@users.noreply.github.com>
Date: Tue, 22 Sep 2020 20:32:09 -0700
Subject: [PATCH] Fix Docker Secrets injection from DB_USER_FILE/DB_PASS_FILE

---
 install/etc/services.available/10-db-backup/run | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/install/etc/services.available/10-db-backup/run b/install/etc/services.available/10-db-backup/run
index f8a5242..d007b05 100755
--- a/install/etc/services.available/10-db-backup/run
+++ b/install/etc/services.available/10-db-backup/run
@@ -33,23 +33,23 @@ case "$dbtype" in
     "mongo" | "mongodb" | "MONGO" | "MONGODB" )
         dbtype=mongo
         dbport=${DB_PORT:-27017}
-        [[ ( -n "${DB_USER}" ) ]] && file_env 'DB_USER'
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_USER}" ) || ( -n "${DB_USER_FILE}" ) ]] && file_env 'DB_USER'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "mysql" | "MYSQL" | "mariadb" | "MARIADB")
         dbtype=mysql
         dbport=${DB_PORT:-3306}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "postgres" | "postgresql" | "pgsql" | "POSTGRES" | "POSTGRESQL" | "PGSQL" )
         dbtype=pgsql
         dbport=${DB_PORT:-5432}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" ) || ( -n "${DB_PASS_FILE}" ) ]] && file_env 'DB_PASS'
     ;;
     "redis" | "REDIS"   )
         dbtype=redis
         dbport=${DB_PORT:-6379}
-        [[ ( -n "${DB_PASS}" ) ]] && file_env 'DB_PASS'
+        [[ ( -n "${DB_PASS}" || ( -n "${DB_PASS_FILE}" ) ) ]] && file_env 'DB_PASS'
     ;;
 esac