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-1572: Make POSTGRESQL env variable backward comp dynamic

Browse Source
This commit is contained in:
jbpaux
2022-08-09 15:27:10 +02:00
committed by Mike Jumper
parent d5fb0822d5
commit c081fd3ff2
1 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
#!/bin/sh -e #!/bin/bash -e
# #
# Licensed to the Apache Software Foundation (ASF) under one # Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file # or more contributor license agreements. See the NOTICE file
@@ -265,60 +265,26 @@ END
## Provide backward compatibility on POSTGRES_* environment variables ## Provide backward compatibility on POSTGRES_* environment variables
## In case of new deployment, please use POSTGRESQL_* equivalent variables. ## In case of new deployment, please use POSTGRESQL_* equivalent variables.
if [ -n "$POSTGRES_HOSTNAME" ]; then for VAR_BASE in \
POSTGRESQL_HOSTNAME=$POSTGRES_HOSTNAME; HOSTNAME PORT \
fi DATABASE USER PASSWORD \
if [ -n "$POSTGRES_PORT" ]; then DATABASE_FILE USER_FILE PASSWORD_FILE \
POSTGRESQL_PORT=$POSTGRES_PORT; ABSOLUTE_MAX_CONNECTIONS DEFAULT_MAX_CONNECTIONS \
fi DEFAULT_MAX_GROUP_CONNECTIONS DEFAULT_MAX_CONNECTIONS_PER_USER \
if [ -n "$POSTGRES_DATABASE" ]; then DEFAULT_MAX_GROUP_CONNECTIONS_PER_USER \
POSTGRESQL_DATABASE=$POSTGRES_DATABASE; DEFAULT_STATEMENT_TIMEOUT SOCKET_TIMEOUT \
fi USER_REQUIRED \
if [ -n "$POSTGRES_DATABASE_FILE" ]; then SSL_KEY_PASSWORD_FILE SSL_KEY_PASSWORD; do
POSTGRESQL_DATABASE=$POSTGRES_DATABASE_FILE;
fi OLD_VAR="POSTGRES_$VAR_BASE"
if [ -n "$POSTGRES_USER_FILE" ]; then NEW_VAR="POSTGRESQL_$VAR_BASE"
POSTGRESQL_USER_FILE=$POSTGRES_USER_FILE;
fi if [ -n "${!OLD_VAR}" ]; then
if [ -n "$POSTGRES_USER" ]; then printf -v "$NEW_VAR" "%s" "${!OLD_VAR}"
POSTGRESQL_USER=$POSTGRES_USER; echo "WARNING: ${OLD_VAR} detected, please use ${NEW_VAR} for further deployments."
fi fi
if [ -n "$POSTGRES_PASSWORD_FILE" ]; then
POSTGRESQL_PASSWORD_FILE=$POSTGRES_PASSWORD_FILE; done
fi
if [ -n "$POSTGRES_PASSWORD" ]; then
POSTGRESQL_PASSWORD=$POSTGRES_PASSWORD;
fi
if [ -n "$POSTGRES_ABSOLUTE_MAX_CONNECTIONS" ]; then
POSTGRESQL_ABSOLUTE_MAX_CONNECTIONS=$POSTGRES_ABSOLUTE_MAX_CONNECTIONS;
fi
if [ -n "$POSTGRES_DEFAULT_MAX_CONNECTIONS" ]; then
POSTGRESQL_DEFAULT_MAX_CONNECTIONS=$POSTGRES_DEFAULT_MAX_CONNECTIONS;
fi
if [ -n "$POSTGRES_DEFAULT_MAX_GROUP_CONNECTIONS" ]; then
POSTGRESQL_DEFAULT_MAX_GROUP_CONNECTIONS=$POSTGRES_DEFAULT_MAX_GROUP_CONNECTIONS;
fi
if [ -n "$POSTGRES_DEFAULT_MAX_CONNECTIONS_PER_USER" ]; then
POSTGRESQL_DEFAULT_MAX_CONNECTIONS_PER_USER=$POSTGRES_DEFAULT_MAX_CONNECTIONS_PER_USER;
fi
if [ -n "$POSTGRES_DEFAULT_MAX_GROUP_CONNECTIONS_PER_USER" ]; then
POSTGRESQL_DEFAULT_MAX_GROUP_CONNECTIONS_PER_USER=$POSTGRES_DEFAULT_MAX_GROUP_CONNECTIONS_PER_USER;
fi
if [ -n "$POSTGRES_DEFAULT_STATEMENT_TIMEOUT" ]; then
POSTGRESQL_DEFAULT_STATEMENT_TIMEOUT=$POSTGRES_DEFAULT_STATEMENT_TIMEOUT;
fi
if [ -n "$POSTGRES_USER_REQUIRED" ]; then
POSTGRESQL_USER_REQUIRED=$POSTGRES_USER_REQUIRED;
fi
if [ -n "$POSTGRES_SOCKET_TIMEOUT" ]; then
POSTGRESQL_SOCKET_TIMEOUT=$POSTGRES_SOCKET_TIMEOUT;
fi
if [ -n "$POSTGRES_SSL_KEY_PASSWORD_FILE" ]; then
POSTGRESQL_SSL_KEY_PASSWORD_FILE=$POSTGRES_SSL_KEY_PASSWORD_FILE;
fi
if [ -n "$POSTGRES_SSL_KEY_PASSWORD" ]; then
POSTGRESQL_SSL_KEY_PASSWORD=$POSTGRES_SSL_KEY_PASSWORD;
fi
## ##
## Adds properties to guacamole.properties which select the PostgreSQL ## Adds properties to guacamole.properties which select the PostgreSQL