]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
squid init: small cosmetic fixes
authorMatthias Fischer <matthias.fischer@ipfire.org>
Sat, 14 May 2016 17:17:03 +0000 (19:17 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 15 May 2016 10:41:25 +0000 (11:41 +0100)
- Deleted a few absolutely unneeded tabs.
- Inserted/deleted some needed/unnecessary line breaks.

Signed-off-by: Matthias Fischer <matthias.fischer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
src/initscripts/init.d/squid

index c641c7d37987ce7fa753e4fc0df2aacba71da6d7..abed90aef653569737edf06ca1ee3786e0a68307 100644 (file)
@@ -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/
                ;;