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

Merge 1.5.3 changes back to master.

Browse Source
This commit is contained in:
Mike Jumper
2023-06-19 08:48:48 -07:00
parent ad9f90718c ee1765f86c
commit 9471bdfe5e
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole-docker/bin/build-guacamole.sh
View File

@@ -197,3 +197,11 @@ if [ -f extensions/guacamole-auth-ban/target/guacamole-auth-ban*.jar ]; then
cp extensions/guacamole-auth-ban/target/guacamole-auth-ban*.jar "$DESTINATION/ban" cp extensions/guacamole-auth-ban/target/guacamole-auth-ban*.jar "$DESTINATION/ban"
fi fi
#
# Copy history recording storage extension if it was built
#
if [ -f extensions/guacamole-history-recording-storage/target/guacamole-history-recording-storage*.jar ]; then
mkdir -p "$DESTINATION/recordings"
cp extensions/guacamole-history-recording-storage/target/guacamole-history-recording-storage*.jar "$DESTINATION/recordings"
fi

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

@@ -942,6 +942,19 @@ associate_json() {
# Add required .jar files to GUACAMOLE_EXT # Add required .jar files to GUACAMOLE_EXT
ln -s /opt/guacamole/json/guacamole-auth-*.jar "$GUACAMOLE_EXT" ln -s /opt/guacamole/json/guacamole-auth-*.jar "$GUACAMOLE_EXT"
} }
##
## Adds properties to guacamole.properties which configure the recording
## storage extension.
##
associate_recordings() {
# Update config file
set_property "recording-search-path" "$RECORDING_SEARCH_PATH"
# Add required .jar files to GUACAMOLE_EXT
ln -s /opt/guacamole/recordings/guacamole-history-recording-storage-*.jar "$GUACAMOLE_EXT"
}
## ##
## Sets up Tomcat's remote IP valve that allows gathering the remote IP ## Sets up Tomcat's remote IP valve that allows gathering the remote IP
## from headers set by a remote proxy ## from headers set by a remote proxy
@@ -1171,6 +1184,11 @@ if [ -n "$JSON_SECRET_KEY" ]; then
INSTALLED_AUTH="$INSTALLED_AUTH json" INSTALLED_AUTH="$INSTALLED_AUTH json"
fi fi
# Add in the history recording storage extension if configured
if [ -n "$RECORDING_SEARCH_PATH" ]; then
associate_recordings
fi
# #
# Validate that at least one authentication backend is installed # Validate that at least one authentication backend is installed
# #