From: Tom Hughes <tom@compton.nu>
Date: Thu, 7 Jun 2018 17:44:27 +0000 (+0100)
Subject: Remove some redundant options from squid 3 configuration
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/e6900e54790a11eaf099dad80a26ae0c6f43c24a

Remove some redundant options from squid 3 configuration
---

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index b92ed1ec3..89f812483 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -60,14 +60,18 @@ connect_timeout 20 seconds
 client_lifetime 1 hours
 
 collapsed_forwarding on
+<% if node[:squid][:version] == "2" -%>
 refresh_stale_hit 300 seconds
+<% end -%>
 
 #Recommended minimum configuration:
 #----------------------------------
+<% if node[:squid][:version] == "2" -%>
 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl to_localhost dst 127.0.0.0/8
+<% end -%>
 acl SSL_ports port 443
 acl Safe_ports port 80          # http
 acl Safe_ports port 21          # ftp