Merge branch 'next' into fifteen

This commit is contained in:
Michael Tremer
2013-10-14 14:12:04 +02:00
14 changed files with 72 additions and 15 deletions

View File

@@ -42,6 +42,15 @@ done
#Extract files
extract_files
if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then
(
eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings)
TRANSPARENT_PORT="$(( ${PROXY_PORT} + 1 ))"
echo "TRANSPORT_PORT=${TRANSPARENT_PORT}" >> /var/ipfire/proxy/advanced/settings
)
fi
# Regenerate squid configuration files.
/srv/web/ipfire/cgi-bin/proxy.cgi