* [PATCH] squid init: small cosmetic fixes
@ 2016-05-14 17:17 Matthias Fischer
0 siblings, 0 replies; only message in thread
From: Matthias Fischer @ 2016-05-14 17:17 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2230 bytes --]
- Deleted a few absolutely unneeded tabs.
- Inserted/deleted some needed/unnecessary line breaks.
Signed-off-by: Matthias Fischer <matthias.fischer(a)ipfire.org>
---
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=`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.8.2
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-05-14 17:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-14 17:17 [PATCH] squid init: small cosmetic fixes Matthias Fischer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox