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

Merge 1.2.0 changes back to master.

Browse Source
This commit is contained in:
Michael Jumper
2020-06-23 11:47:02 -07:00
parent 5175dd3d29 5adba87fbb
commit 3912439472
1 changed files with 55 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,7 +151,7 @@ END
# Verify that the required Docker secrets are present, else, default to their normal environment variables # Verify that the required Docker secrets are present, else, default to their normal environment variables
if [ -n "$MYSQL_USER_FILE" ]; then if [ -n "$MYSQL_USER_FILE" ]; then
set_property "mysql-username" `cat $MYSQL_USER_FILE` set_property "mysql-username" "`cat "$MYSQL_USER_FILE"`"
elif [ -n "$MYSQL_USER" ]; then elif [ -n "$MYSQL_USER" ]; then
set_property "mysql-username" "$MYSQL_USER" set_property "mysql-username" "$MYSQL_USER"
else else
@@ -160,7 +160,7 @@ END
fi fi
if [ -n "$MYSQL_PASSWORD_FILE" ]; then if [ -n "$MYSQL_PASSWORD_FILE" ]; then
set_property "mysql-password" `cat $MYSQL_PASSWORD_FILE` set_property "mysql-password" "`cat "$MYSQL_PASSWORD_FILE"`"
elif [ -n "$MYSQL_PASSWORD" ]; then elif [ -n "$MYSQL_PASSWORD" ]; then
set_property "mysql-password" "$MYSQL_PASSWORD" set_property "mysql-password" "$MYSQL_PASSWORD"
else else
@@ -169,7 +169,7 @@ END
fi fi
if [ -n "$MYSQL_DATABASE_FILE" ]; then if [ -n "$MYSQL_DATABASE_FILE" ]; then
set_property "mysql-database" `cat $MYSQL_DATABASE_FILE` set_property "mysql-database" "`cat "$MYSQL_DATABASE_FILE"`"
elif [ -n "$MYSQL_DATABASE" ]; then elif [ -n "$MYSQL_DATABASE" ]; then
set_property "mysql-database" "$MYSQL_DATABASE" set_property "mysql-database" "$MYSQL_DATABASE"
else else
@@ -205,6 +205,32 @@ END
"mysql-user-required" \ "mysql-user-required" \
"$MYSQL_USER_REQUIRED" "$MYSQL_USER_REQUIRED"
set_optional_property \
"mysql-ssl-mode" \
"$MYSQL_SSL_MODE"
set_optional_property \
"mysql-ssl-trust-store" \
"$MYSQL_SSL_TRUST_STORE"
# For SSL trust store password, check secrets, first, then standard env variable
if [ -n "$MYSQL_SSL_TRUST_PASSWORD_FILE" ]; then
set_property "mysql-ssl-trust-password" "`cat "$MYSQL_SSL_TRUST_PASSWORD_FILE"`"
elif [ -n "$MYSQL_SSL_TRUST_PASSWORD" ]; then
set_property "mysql-ssl-trust-password" "$MYSQL_SSL_TRUST_PASSWORD"
fi
set_optional_property \
"mysql-ssl-client-store" \
"$MYSQL_SSL_CLIENT_STORE"
# For SSL trust store password, check secrets, first, then standard env variable
if [ -n "$MYSQL_SSL_CLIENT_PASSWORD_FILE" ]; then
set_property "mysql-ssl-client-password" "`cat "$MYSQL_SSL_CLIENT_PASSWORD_FILE"`"
elif [ -n "$MYSQL_SSL_CLIENT_PASSWORD" ]; then
set_property "mysql-ssl-client-password" "$MYSQL_SSL_CLIENT_PASSWORD"
fi
# Add required .jar files to GUACAMOLE_LIB and GUACAMOLE_EXT # Add required .jar files to GUACAMOLE_LIB and GUACAMOLE_EXT
ln -s /opt/guacamole/mysql/mysql-connector-*.jar "$GUACAMOLE_LIB" ln -s /opt/guacamole/mysql/mysql-connector-*.jar "$GUACAMOLE_LIB"
ln -s /opt/guacamole/mysql/guacamole-auth-*.jar "$GUACAMOLE_EXT" ln -s /opt/guacamole/mysql/guacamole-auth-*.jar "$GUACAMOLE_EXT"
@@ -278,7 +304,7 @@ END
# Verify that the required Docker secrets are present, else, default to their normal environment variables # Verify that the required Docker secrets are present, else, default to their normal environment variables
if [ -n "$POSTGRES_USER_FILE" ]; then if [ -n "$POSTGRES_USER_FILE" ]; then
set_property "postgresql-username" `cat $POSTGRES_USER_FILE` set_property "postgresql-username" "`cat "$POSTGRES_USER_FILE"`"
elif [ -n "$POSTGRES_USER" ]; then elif [ -n "$POSTGRES_USER" ]; then
set_property "postgresql-username" "$POSTGRES_USER" set_property "postgresql-username" "$POSTGRES_USER"
else else
@@ -287,7 +313,7 @@ END
fi fi
if [ -n "$POSTGRES_PASSWORD_FILE" ]; then if [ -n "$POSTGRES_PASSWORD_FILE" ]; then
set_property "postgresql-password" `cat $POSTGRES_PASSWORD_FILE` set_property "postgresql-password" "`cat "$POSTGRES_PASSWORD_FILE"`"
elif [ -n "$POSTGRES_PASSWORD" ]; then elif [ -n "$POSTGRES_PASSWORD" ]; then
set_property "postgresql-password" "$POSTGRES_PASSWORD" set_property "postgresql-password" "$POSTGRES_PASSWORD"
else else
@@ -296,7 +322,7 @@ END
fi fi
if [ -n "$POSTGRES_DATABASE_FILE" ]; then if [ -n "$POSTGRES_DATABASE_FILE" ]; then
set_property "postgresql-database" `cat $POSTGRES_DATABASE_FILE` set_property "postgresql-database" "`cat "$POSTGRES_DATABASE_FILE"`"
elif [ -n "$POSTGRES_DATABASE" ]; then elif [ -n "$POSTGRES_DATABASE" ]; then
set_property "postgresql-database" "$POSTGRES_DATABASE" set_property "postgresql-database" "$POSTGRES_DATABASE"
else else
@@ -332,6 +358,29 @@ END
"postgresql-user-required" \ "postgresql-user-required" \
"$POSTGRES_USER_REQUIRED" "$POSTGRES_USER_REQUIRED"
set_optional_property \
"postgresql-ssl-mode" \
"$POSTGRESQL_SSL_MODE"
set_optional_property \
"postgresql-ssl-cert-file" \
"$POSTGRESQL_SSL_CERT_FILE"
set_optional_property \
"postgresql-ssl-key-file" \
"$POSTGRESQL_SSL_KEY_FILE"
set_optional_property \
"postgresql-ssl-root-cert-file" \
"$POSTGRESQL_SSL_ROOT_CERT_FILE"
# For SSL key password, check secrets, first, then standard env variable
if [ -n "$POSTGRES_SSL_KEY_PASSWORD_FILE" ]; then
set_property "postgresql-ssl-key-password" "`cat "$POSTGRES_SSL_KEY_PASSWORD_FILE"`"
elif [ -n "$POSTGRES_SSL_KEY_PASSWORD" ]; then
set_property "postgresql-ssl-key-password" "$POSTGRES_SSL_KEY_PASSWORD"
fi
# Add required .jar files to GUACAMOLE_LIB and GUACAMOLE_EXT # Add required .jar files to GUACAMOLE_LIB and GUACAMOLE_EXT
ln -s /opt/guacamole/postgresql/postgresql-*.jar "$GUACAMOLE_LIB" ln -s /opt/guacamole/postgresql/postgresql-*.jar "$GUACAMOLE_LIB"
ln -s /opt/guacamole/postgresql/guacamole-auth-*.jar "$GUACAMOLE_EXT" ln -s /opt/guacamole/postgresql/guacamole-auth-*.jar "$GUACAMOLE_EXT"