From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 19 Dec 2010 20:12:07 +0000 (+0100)
Subject: Updater: convert squid config.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d7aea5bdecae31f62fee176bdccb4ff3d8be26a6

Updater: convert squid config.
---

diff --git a/config/rootfiles/core/44/update.sh b/config/rootfiles/core/44/update.sh
index c0abbe766..ff04e5518 100644
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@ -171,6 +171,14 @@ mv /var/ipfire/vpn/ipsec.conf /var/ipfire/vpn/ipsec.conf.org
 grep -v "keyexchange=ikev1" /var/ipfire/vpn/ipsec.conf.org > /var/ipfire/vpn/ipsec.conf
 sed -i "s|^conn [A-Za-z].*$|&\n\tkeyexchange=ikev1|g" /var/ipfire/vpn/ipsec.conf
 
+#new squid has some changed options. Build a basic config to be able start squid.
+mv /var/ipfire/proxy/squid.conf /var/ipfire/proxy/squid.conf.org
+grep -v "header_access " /var/ipfire/proxy/squid.conf.org | \
+grep -v "error_directory " | \
+grep -v "reply_body_max_size 0" > /var/ipfire/proxy/squid.conf
+echo >> /var/ipfire/proxy/squid.conf
+echo error_directory /etc/squid/errors >> /var/ipfire/proxy/squid.conf
+
 #
 # Start services
 #