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-1005: Docker, correct RemoteIPValve configuration file path

Browse Source
This commit is contained in:
Giacomo Longo
2021-03-06 22:08:49 +01:00
parent 205cf1797d
commit d91bfc9c9c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -742,7 +742,7 @@ enable_remote_ip_valve() {
${GUACAMOLE_PROXY_BY_HEADER:+remoteIpProxiesHeader=\"$GUACAMOLE_PROXY_BY_HEADER\"} \ ${GUACAMOLE_PROXY_BY_HEADER:+remoteIpProxiesHeader=\"$GUACAMOLE_PROXY_BY_HEADER\"} \
${GUACAMOLE_PROXY_PROTOCOL_HEADER:+protocolHeader=\"$GUACAMOLE_PROXY_PROTOCOL_HEADER\"} \ ${GUACAMOLE_PROXY_PROTOCOL_HEADER:+protocolHeader=\"$GUACAMOLE_PROXY_PROTOCOL_HEADER\"} \
/>\n\1</Host>|" \ />\n\1</Host>|" \
/usr/local/tomcat/conf/server.xml $CATALINA_BASE/conf/server.xml
} }
## ##
@@ -759,6 +759,11 @@ start_guacamole() {
done done
cp -R /usr/local/tomcat/conf $CATALINA_BASE cp -R /usr/local/tomcat/conf $CATALINA_BASE
# Set up Tomcat RemoteIPValve
if [ "$REMOTE_IP_VALVE_ENABLED" = "true" ]; then
enable_remote_ip_valve
fi
# Install webapp # Install webapp
ln -sf /opt/guacamole/guacamole.war $CATALINA_BASE/webapps/${WEBAPP_CONTEXT:-guacamole}.war ln -sf /opt/guacamole/guacamole.war $CATALINA_BASE/webapps/${WEBAPP_CONTEXT:-guacamole}.war
@@ -830,11 +835,6 @@ fi
set_property "guacd-hostname" "$GUACD_HOSTNAME" set_property "guacd-hostname" "$GUACD_HOSTNAME"
set_property "guacd-port" "$GUACD_PORT" set_property "guacd-port" "$GUACD_PORT"
# Set up Tomcat RemoteIPValve
if [ "$REMOTE_IP_VALVE_ENABLED" = "true" ]; then
enable_remote_ip_valve
fi
# #
# Track which authentication backends are installed # Track which authentication backends are installed
# #