From fdc0cd11cca6be46ec295013fdb7ac1f51af694a Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 11 Oct 2018 11:26:04 +0200
Subject: [redsocks] Disable env vars for now as we cannot use ip range in
 NO_PROXY

---
 .../redsocks/data/opt/openslx/scripts/systemd-setup_proxy  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'core/modules/redsocks')

diff --git a/core/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy b/core/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
index 68501f20..4a40ffdc 100755
--- a/core/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
+++ b/core/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy
@@ -29,13 +29,13 @@ fi
 [ "$PROXY" == "off" ] && echo "Proxy mode not required." && exit 0
 echo "Setting up transparent proxying via $SLX_PROXY_IP"
 
-# Do this in addition so proxy-aware programs can use it directly
-mkdir -p /etc/profile.d
-if [ "${SLX_PROXY_TYPE:0:5}" = "http-" ]; then
-	echo "export http_proxy=http://${SLX_PROXY_IP}:${SLX_PROXY_PORT}/" > "/etc/profile.d/system-proxy.sh"
-elif [ "${SLX_PROXY_TYPE:0:5}" = "socks" ]; then
-	echo "export ALL_PROXY=${SLX_PROXY_TYPE}://${SLX_PROXY_IP}:${SLX_PROXY_PORT}/" > "/etc/profile.d/system-proxy.sh"
-fi
+## Do this in addition so proxy-aware programs can use it directly
+#mkdir -p /etc/profile.d
+#if [ "${SLX_PROXY_TYPE:0:5}" = "http-" ]; then
+#	echo "export http_proxy=http://${SLX_PROXY_IP}:${SLX_PROXY_PORT}/" > "/etc/profile.d/system-proxy.sh"
+#elif [ "${SLX_PROXY_TYPE:0:5}" = "socks" ]; then
+#	echo "export ALL_PROXY=${SLX_PROXY_TYPE}://${SLX_PROXY_IP}:${SLX_PROXY_PORT}/" > "/etc/profile.d/system-proxy.sh"
+#fi
 
 sed -i "s/%%PROXY_IP%%/$SLX_PROXY_IP/g;s/%%PROXY_PORT%%/$SLX_PROXY_PORT/g;s/%%PROXY_TYPE%%/$SLX_PROXY_TYPE/g" /etc/redsocks.conf
 
-- 
cgit v1.2.3-55-g7522