admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Proxy parameters check only done when proxy is on

Browse Source
This commit is contained in:
Quentin McGaw
2019-09-10 00:10:18 -04:00
parent bea809778b
commit eee538ab52
1 changed files with 41 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
entrypoint.sh
View File

@@ -107,6 +107,7 @@ if [ "$PORT_FORWARDING" == "on" ] && [ -z "$PORT_FORWARDING_STATUS_FILE" ]; then
exit 1 exit 1
fi fi
exitIfNotIn TINYPROXY "on,off" exitIfNotIn TINYPROXY "on,off"
if [ "$TINYPROXY" == "on" ]; then
exitIfNotIn TINYPROXY_LOG "Info,Warning,Error,Critical" exitIfNotIn TINYPROXY_LOG "Info,Warning,Error,Critical"
if [ -z $TINYPROXY_PORT ]; then if [ -z $TINYPROXY_PORT ]; then
TINYPROXY_PORT=8888 TINYPROXY_PORT=8888
@@ -128,7 +129,9 @@ elif [ -z "$TINYPROXY_USER" ] && [ ! -z "$TINYPROXY_PASSWORD" ]; then
printf "TINYPROXY_USER is not set but TINYPROXY_PASSWORD is set\n" printf "TINYPROXY_USER is not set but TINYPROXY_PASSWORD is set\n"
exit 1 exit 1
fi fi
fi
exitIfNotIn SHADOWSOCKS "on,off" exitIfNotIn SHADOWSOCKS "on,off"
if [ "$SHADOWSOCKS" == "on" ]; then
exitIfNotIn SHADOWSOCKS_LOG "on,off" exitIfNotIn SHADOWSOCKS_LOG "on,off"
if [ -z $SHADOWSOCKS_PORT ]; then if [ -z $SHADOWSOCKS_PORT ]; then
SHADOWSOCKS_PORT=8388 SHADOWSOCKS_PORT=8388
@@ -147,6 +150,7 @@ if [ -z $SHADOWSOCKS_PASSWORD ]; then
printf "SHADOWSOCKS_PASSWORD is not set\n" printf "SHADOWSOCKS_PASSWORD is not set\n"
exit 1 exit 1
fi fi
fi
############################################ ############################################
# SHOW PARAMETERS # SHOW PARAMETERS
@@ -447,7 +451,6 @@ fi
############################################ ############################################
if [ "$SHADOWSOCKS" == "on" ]; then if [ "$SHADOWSOCKS" == "on" ]; then
ARGS="-c /etc/shadowsocks.json" ARGS="-c /etc/shadowsocks.json"
# add -d 127.0.0.1 for DNS?
if [ "$SHADOWSOCKS_LOG" == " on" ]; then if [ "$SHADOWSOCKS_LOG" == " on" ]; then
printf "[INFO] Setting ShadowSocks logging..." printf "[INFO] Setting ShadowSocks logging..."
ARGS="$ARGS -v" ARGS="$ARGS -v"