From 88c47dee267c29a8f97a0045ca22946e1bac5940 Mon Sep 17 00:00:00 2001 From: Giacomo Longo Date: Sat, 12 Jun 2021 12:09:33 +0200 Subject: [PATCH] GUACAMOLE-1005: Drop GUACAMOLE_ environment variable prefix --- guacamole-docker/bin/start.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/guacamole-docker/bin/start.sh b/guacamole-docker/bin/start.sh index c79fafc89..c13d2407d 100755 --- a/guacamole-docker/bin/start.sh +++ b/guacamole-docker/bin/start.sh @@ -721,42 +721,42 @@ enable_remote_ip_valve() { $CATALINA_BASE/conf/server.xml # Allowed IPs - if [ -z "$GUACAMOLE_PROXY_ALLOWED_IPS_REGEX" ]; then - echo "Using default Tomcat allowed IPs regex" + if [ -z "$PROXY_ALLOWED_IPS_REGEX" ]; then + echo "Using default Tomcat allowed IPs regex" else xmlstarlet edit --inplace \ --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 fi # X-Forwarded-For - if [ -z "$GUACAMOLE_PROXY_IP_HEADER" ]; then + if [ -z "$PROXY_IP_HEADER" ]; then echo "Using default Tomcat proxy IP header" else xmlstarlet edit --inplace \ --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 fi # X-Forwarded-Proto - if [ -z "$GUACAMOLE_PROXY_PROTOCOL_HEADER" ]; then + if [ -z "$PROXY_PROTOCOL_HEADER" ]; then echo "Using default Tomcat proxy protocol header" else xmlstarlet edit --inplace \ --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 fi # X-Forwarded-By - if [ -z "$GUACAMOLE_PROXY_BY_HEADER" ]; then + if [ -z "$PROXY_BY_HEADER" ]; then echo "Using default Tomcat proxy forwarded by header" else xmlstarlet edit --inplace \ --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 fi }