From bb91c2f74439495a7fd4a62337dc7f41386fa42a Mon Sep 17 00:00:00 2001 From: Matthias Fischer Date: Sat, 14 May 2016 19:17:03 +0200 Subject: [PATCH] squid init: small cosmetic fixes - Deleted a few absolutely unneeded tabs. - Inserted/deleted some needed/unnecessary line breaks. Signed-off-by: Matthias Fischer Signed-off-by: Michael Tremer --- 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 c641c7d379..abed90aef6 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -33,16 +33,16 @@ transparent() { CONN_TYPE=`echo "$LINE" | awk -F, '{ print $5 }'` if [ "$CONN_TYPE" != "net" ]; then continue - fi - iptables -t nat -A SQUID -i $1 -p tcp -d `echo "$LINE" | awk -F, '{ print $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 - + if [ "$RED_TYPE" == "STATIC" ]; then iptables -t nat -A SQUID -i $1 -p tcp -d $RED_NETADDRESS/$RED_NETMASK --dport 80 -j RETURN fi - + iptables -t nat -A SQUID -i $1 -p tcp -d $LOCALIP --dport 80 -j RETURN - + iptables -t nat -A SQUID -i $1 -p tcp --dport 80 -j REDIRECT --to-port "${TRANSPARENT_PORT}" } @@ -57,7 +57,6 @@ case "$1" in exit fi - eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings) eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings) @@ -100,7 +99,7 @@ case "$1" in evaluate_retval # Stop squidGuard, updxlrator, squidclamav - # and redirect_wrappers. + # 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 # Trash remain pid file from squid. - rm -rf /var/run/squid.pid + rm -rf /var/run/squid.pid fi ;; @@ -141,7 +140,7 @@ case "$1" in statusproc /usr/sbin/squid statusproc /usr/lib/squid/unlinkd ;; - + 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/ ;; -- 2.39.2