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-1005: Drop GUACAMOLE_ environment variable prefix

Browse Source
This commit is contained in:
Giacomo Longo
2021-06-12 12:09:33 +02:00
parent e25be1960d
commit 88c47dee26
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -721,42 +721,42 @@ enable_remote_ip_valve() {
$CATALINA_BASE/conf/server.xml $CATALINA_BASE/conf/server.xml
# Allowed IPs # Allowed IPs
if [ -z "$GUACAMOLE_PROXY_ALLOWED_IPS_REGEX" ]; then if [ -z "$PROXY_ALLOWED_IPS_REGEX" ]; then
echo "Using default Tomcat allowed IPs regex" echo "Using default Tomcat allowed IPs regex"
else else
xmlstarlet edit --inplace \ xmlstarlet edit --inplace \
--insert '/Server/Service/Engine/Host/Valve[@className="org.apache.catalina.valves.RemoteIpValve"]' \ --insert '/Server/Service/Engine/Host/Valve[@className="org.apache.catalina.valves.RemoteIpValve"]' \
--type attr -n internalProxies -v "$GUACAMOLE_PROXY_ALLOWED_IPS_REGEX" \ --type attr -n internalProxies -v "$PROXY_ALLOWED_IPS_REGEX" \
$CATALINA_BASE/conf/server.xml $CATALINA_BASE/conf/server.xml
fi fi
# X-Forwarded-For # X-Forwarded-For
if [ -z "$GUACAMOLE_PROXY_IP_HEADER" ]; then if [ -z "$PROXY_IP_HEADER" ]; then
echo "Using default Tomcat proxy IP header" echo "Using default Tomcat proxy IP header"
else else
xmlstarlet edit --inplace \ xmlstarlet edit --inplace \
--insert "/Server/Service/Engine/Host/Valve[@className='org.apache.catalina.valves.RemoteIpValve']" \ --insert "/Server/Service/Engine/Host/Valve[@className='org.apache.catalina.valves.RemoteIpValve']" \
--type attr -n remoteIpHeader -v "$GUACAMOLE_PROXY_IP_HEADER" \ --type attr -n remoteIpHeader -v "$PROXY_IP_HEADER" \
$CATALINA_BASE/conf/server.xml $CATALINA_BASE/conf/server.xml
fi fi
# X-Forwarded-Proto # X-Forwarded-Proto
if [ -z "$GUACAMOLE_PROXY_PROTOCOL_HEADER" ]; then if [ -z "$PROXY_PROTOCOL_HEADER" ]; then
echo "Using default Tomcat proxy protocol header" echo "Using default Tomcat proxy protocol header"
else else
xmlstarlet edit --inplace \ xmlstarlet edit --inplace \
--insert "/Server/Service/Engine/Host/Valve[@className='org.apache.catalina.valves.RemoteIpValve']" \ --insert "/Server/Service/Engine/Host/Valve[@className='org.apache.catalina.valves.RemoteIpValve']" \
--type attr -n protocolHeader -v "$GUACAMOLE_PROXY_PROTOCOL_HEADER" \ --type attr -n protocolHeader -v "$PROXY_PROTOCOL_HEADER" \
$CATALINA_BASE/conf/server.xml $CATALINA_BASE/conf/server.xml
fi fi
# X-Forwarded-By # X-Forwarded-By
if [ -z "$GUACAMOLE_PROXY_BY_HEADER" ]; then if [ -z "$PROXY_BY_HEADER" ]; then
echo "Using default Tomcat proxy forwarded by header" echo "Using default Tomcat proxy forwarded by header"
else else
xmlstarlet edit --inplace \ xmlstarlet edit --inplace \
--insert "/Server/Service/Engine/Host/Valve[@className='org.apache.catalina.valves.RemoteIpValve']" \ --insert "/Server/Service/Engine/Host/Valve[@className='org.apache.catalina.valves.RemoteIpValve']" \
--type attr -n remoteIpProxiesHeader -v "$GUACAMOLE_PROXY_BY_HEADER" \ --type attr -n remoteIpProxiesHeader -v "$PROXY_BY_HEADER" \
$CATALINA_BASE/conf/server.xml $CATALINA_BASE/conf/server.xml
fi fi
} }