From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: [PATCH] squid init: small cosmetic fixes Date: Sat, 14 May 2016 19:17:03 +0200 Message-ID: <1463246223-1281-1-git-send-email-matthias.fischer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5366608543407246145==" List-Id: --===============5366608543407246145== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - Deleted a few absolutely unneeded tabs. - Inserted/deleted some needed/unnecessary line breaks. Signed-off-by: Matthias Fischer --- src/initscripts/init.d/squid | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index c641c7d..abed90a 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -33,16 +33,16 @@ transparent() { CONN_TYPE=3D`echo "$LINE" | awk -F, '{ print $5 }'` if [ "$CONN_TYPE" !=3D "net" ]; then continue - fi =20 - iptables -t nat -A SQUID -i $1 -p tcp -d `echo "$LINE" | awk -F, '{ prin= t $13 }'` --dport 80 -j RETURN + fi + iptables -t nat -A SQUID -i $1 -p tcp -d `echo "$LINE" | awk -F, '{ print = $13 }'` --dport 80 -j RETURN done < $FILE - =09 + if [ "$RED_TYPE" =3D=3D "STATIC" ]; then iptables -t nat -A SQUID -i $1 -p tcp -d $RED_NETADDRESS/$RED_NETMASK --d= port 80 -j RETURN fi - =09 + iptables -t nat -A SQUID -i $1 -p tcp -d $LOCALIP --dport 80 -j RETURN - =09 + iptables -t nat -A SQUID -i $1 -p tcp --dport 80 -j REDIRECT --to-port "${= TRANSPARENT_PORT}" } =20 @@ -57,7 +57,6 @@ case "$1" in exit fi =20 - eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) =20 @@ -100,7 +99,7 @@ case "$1" in evaluate_retval =20 # Stop squidGuard, updxlrator, squidclamav - # and redirect_wrappers. =09 + # and redirect_wrappers. killproc /usr/bin/squidGuard >/dev/null & killproc /usr/sbin/updxlrator >/dev/null & killproc /usr/bin/squidclamav >/dev/null & @@ -123,7 +122,7 @@ case "$1" in killproc /usr/sbin/squid >/dev/null =20 # Trash remain pid file from squid. - rm -rf /var/run/squid.pid=09 + rm -rf /var/run/squid.pid fi ;; =20 @@ -141,7 +140,7 @@ case "$1" in statusproc /usr/sbin/squid statusproc /usr/lib/squid/unlinkd ;; - =09 + flush) $0 stop echo > /var/log/cache/swap.state @@ -149,6 +148,7 @@ case "$1" in sleep 1 $0 start ;; + setperms) chown -R nobody.squid /var/updatecache/ ;; --=20 2.8.2 --===============5366608543407246145==--