Merge remote-tracking branch 'origin/pr/242'
* origin/pr/242: tinyproxy: support rsync for Gentoo
This commit is contained in:
commit
497dd8d50d
@ -21,6 +21,8 @@ Allow 127.0.0.1
|
||||
Allow 10.137.0.0/16
|
||||
|
||||
ConnectPort 443
|
||||
# Gentoo uses Rsync for its main repository
|
||||
ConnectPort 873
|
||||
|
||||
# Explicitly block connections to the proxy IP, to return an error in such
|
||||
# case. This error page contains a magic string which is used in Whonix to
|
||||
|
@ -77,7 +77,8 @@ EOF
|
||||
|
||||
# Determine whether the proxy should be used
|
||||
if qsvc yum-proxy-setup || qsvc updates-proxy-setup ; then
|
||||
PROXY_ADDR="http://127.0.0.1:8082/"
|
||||
PROXY_ADDR_BASE="127.0.0.1:8082"
|
||||
PROXY_ADDR="http://${PROXY_ADDR_BASE}/"
|
||||
PROXY_CONF_ENTRY="proxy=$PROXY_ADDR"
|
||||
else
|
||||
PROXY_ADDR=""
|
||||
@ -148,5 +149,6 @@ fi
|
||||
# Portage (Gentoo)
|
||||
if [ -e /etc/portage/make.conf ]; then
|
||||
update_conf /etc/portage/make.conf "http_proxy=\"$PROXY_ADDR\"
|
||||
https_proxy=\"$PROXY_ADDR\""
|
||||
https_proxy=\"$PROXY_ADDR\"
|
||||
RSYNC_PROXY=\"${PROXY_ADDR_BASE}\""
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user