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

GUACAMOLE-1475: Merge make api-session-timeout set-able via Docker env var

Browse Source
This commit is contained in:
Virtually Nick
2021-12-14 14:24:53 -05:00
committed by GitHub
parent 137beacaf7 6857c1d220
commit da495eb7c3
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -710,6 +710,13 @@ associate_json() {
ln -s /opt/guacamole/json/guacamole-auth-*.jar "$GUACAMOLE_EXT" ln -s /opt/guacamole/json/guacamole-auth-*.jar "$GUACAMOLE_EXT"
} }
##
## Adds api-session-timeout to guacamole.properties
##
associate_apisessiontimeout() {
set_optional_property "api-session-timeout" "$API_SESSION_TIMEOUT"
}
## ##
## Starts Guacamole under Tomcat, replacing the current process with the ## Starts Guacamole under Tomcat, replacing the current process with the
## Tomcat process. As the current process will be replaced, this MUST be the ## Tomcat process. As the current process will be replaced, this MUST be the
@@ -873,6 +880,11 @@ if [ -n "$JSON_SECRET_KEY" ]; then
associate_json associate_json
fi fi
# Use api-session-timeout if specified.
if [ -n "$API_SESSION_TIMEOUT" ]; then
associate_apisessiontimeout
fi
# Set logback level if specified # Set logback level if specified
if [ -n "$LOGBACK_LEVEL" ]; then if [ -n "$LOGBACK_LEVEL" ]; then
unzip -o -j /opt/guacamole/guacamole.war WEB-INF/classes/logback.xml -d $GUACAMOLE_HOME unzip -o -j /opt/guacamole/guacamole.war WEB-INF/classes/logback.xml -d $GUACAMOLE_HOME