diff options
| author | Simon Rettberg | 2018-10-11 11:26:04 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2018-10-11 11:26:04 +0200 |
| commit | fdc0cd11cca6be46ec295013fdb7ac1f51af694a (patch) | |
| tree | 5ceb08db66a5a09b79246cbe62c0991e239055ab /core/modules/redsocks | |
| parent | [rfs-stage31] Write haveged pidfile to /tmp (diff) | |
| download | mltk-fdc0cd11cca6be46ec295013fdb7ac1f51af694a.tar.gz mltk-fdc0cd11cca6be46ec295013fdb7ac1f51af694a.tar.xz mltk-fdc0cd11cca6be46ec295013fdb7ac1f51af694a.zip | |
[redsocks] Disable env vars for now as we cannot use ip range in NO_PROXY
Diffstat (limited to 'core/modules/redsocks')
| -rwxr-xr-x | core/modules/redsocks/data/opt/openslx/scripts/systemd-setup_proxy | 14 |
1 files changed, 7 insertions, 7 deletions
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 |