docker
/
squid-4
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

proxychains templating fix

This commit is contained in:
Will Rouesnel 2016-04-14 01:01:11 +10:00
parent b5f235eea7
commit f3090564cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
README.md
View File

@ -77,9 +77,9 @@ others above, `CONFIG_DISABLE` prevents overwriting templated files.
determines the order in which they are templated into the configuration file.
The format is a space separated string like "http 127.0.0.1 3129"
* `PROXYCHAIN_TYPE`
Default `strict-chain`. Can be `strict-chain` or `dynamic-chain` sensibly
within this image. In `strict-chain` mode, all proxies must be up. In
`dynamic-chain` mode proxies are used in order, but skipped if down.
Default `strict_chain`. Can be `strict_chain` or `dynamic_chain` sensibly
within this image. In `strict_chain` mode, all proxies must be up. In
`dynamic_chain` mode proxies are used in order, but skipped if down.
Disable configuration and bind a configuration file to /etc/proxychains.conf
if you need more flexibility.

2
docker-squid/squid.bsh
View File

@ -77,7 +77,7 @@ if [ "$PROXYCHAIN" = "yes" ] && [ "$CONFIG_DISABLE" != "yes" ]; then
if [ ! -z "$PROXYCHAIN_TYPE" ]; then
echo "$PROXYCHAIN_TYPE" >> /etc/proxychains.conf
else
echo "strict-chain" >> /etc/proxychains.conf
echo "strict_chain" >> /etc/proxychains.conf
fi
echo "[ProxyList]" >> /etc/proxychains.conf
env | grep 'PROXYCHAIN_PROXY' | sort | while read proxyline; do