safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-06 13:17:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-626: Few additional changes to add secret support

Browse Source 
Remove bug causing Docker secret for database file to prevent the script from completing successfully.
This commit is contained in:
Thomas John Wesolowski
2018-08-09 22:25:23 -05:00
committed by Thomas Wesolowski
parent 32c2618ca9
commit a7ed572e3b
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole-docker/bin/start.sh
View File

@@ -290,12 +290,6 @@ END`
exit 1; exit 1;
fi 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 # Update config file
set_property "postgresql-hostname" "$POSTGRES_HOSTNAME" set_property "postgresql-hostname" "$POSTGRES_HOSTNAME"
set_property "postgresql-port" "$POSTGRES_PORT" set_property "postgresql-port" "$POSTGRES_PORT"
@@ -458,13 +452,13 @@ set_property "guacd-port" "$GUACD_PORT"
INSTALLED_AUTH="" INSTALLED_AUTH=""
# Use MySQL if database specified # Use MySQL if database specified
if [ -n "$MYSQL_DATABASE" ]; then if [ -n "$MYSQL_DATABASE" -o -n "$MYSQL_DATABASE_FILE" ]; then
associate_mysql associate_mysql
INSTALLED_AUTH="$INSTALLED_AUTH mysql" INSTALLED_AUTH="$INSTALLED_AUTH mysql"
fi fi
# Use PostgreSQL if database specified # Use PostgreSQL if database specified
if [ -n "$POSTGRES_DATABASE" ]; then if [ -n "$POSTGRES_DATABASE" -o -n "$POSTGRES_DATABASE_FILE" ]; then
associate_postgresql associate_postgresql
INSTALLED_AUTH="$INSTALLED_AUTH postgres" INSTALLED_AUTH="$INSTALLED_AUTH postgres"
fi fi