[Qa-jenkins-scm] [jenkins.debian.net] 01/01: Fix squid3 configuration

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 3331d1aff543dd33f4cdfa70e1d7fad846ffce7f
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jun 2 18:25:40 2015 +0200

    Fix squid3 configuration
    
    according to
    http://wiki.squid-cache.org/SquidFaq/ConfiguringSquid#Squid-3.2_default_config
    these lines are now built-in and hence should not be present in the
    configuration.
---
 etc/squid3/squid.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/squid3/squid.conf b/etc/squid3/squid.conf
index 8b36919..4173bbf 100644
--- a/etc/squid3/squid.conf
+++ b/etc/squid3/squid.conf
@@ -689,10 +689,10 @@
 #
 #
 # Recommended minimum configuration:
-#
-acl manager proto cache_object
-acl localhost src 127.0.0.1/32 ::1
-acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
+# (now built-in)
+#acl manager proto cache_object
+#acl localhost src 127.0.0.1/32 ::1
+#acl to_localhost dst 127.0.0.0/8 0.0.0.0/32 ::1
 
 # Example rule allowing access from your local networks.
 # Adapt to list your (internal) IP networks from where browsing

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git