From a7ed572e3b974569f8d25f4e4f86adbfe9e8c828 Mon Sep 17 00:00:00 2001
From: Thomas John Wesolowski <wojoinc@iastate.edu>
Date: Thu, 9 Aug 2018 22:25:23 -0500
Subject: [PATCH] GUACAMOLE-626: Few additional changes to add secret support

Remove bug causing Docker secret for database file to prevent the script from completing successfully.
---
 guacamole-docker/bin/start.sh | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh
index 7035edf04..c798300f2 100755
--- a/guacamole-docker/bin/start.sh
+++ b/guacamole-docker/bin/start.sh
@@ -290,12 +290,6 @@ END`
         exit 1;
     fi
 
-    # Verify required parameters are present
-    if [ -z "$POSTGRES_USER" -o -z "$POSTGRES_PASSWORD" -o -z "$POSTGRES_DATABASE" ]; then
-        cat 
-        exit 1;
-    fi
-
     # Update config file
     set_property "postgresql-hostname" "$POSTGRES_HOSTNAME"
     set_property "postgresql-port"     "$POSTGRES_PORT"
@@ -458,13 +452,13 @@ set_property "guacd-port"     "$GUACD_PORT"
 INSTALLED_AUTH=""
 
 # Use MySQL if database specified
-if [ -n "$MYSQL_DATABASE" ]; then
+if [ -n "$MYSQL_DATABASE" -o -n "$MYSQL_DATABASE_FILE" ]; then
     associate_mysql
     INSTALLED_AUTH="$INSTALLED_AUTH mysql"
 fi
 
 # Use PostgreSQL if database specified
-if [ -n "$POSTGRES_DATABASE" ]; then
+if [ -n "$POSTGRES_DATABASE" -o -n "$POSTGRES_DATABASE_FILE" ]; then
     associate_postgresql
     INSTALLED_AUTH="$INSTALLED_AUTH postgres"
 fi