X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/792c1eb95437d9d532eeb83832152a8cd5fd1811..3eab6dd1024f0750e15c3f0cb6f7a1230d1aca89:/cookbooks/squid/templates/default/squid.conf.erb

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index 0b8189d33..fbb07641f 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -19,9 +19,6 @@ log_icp_queries off
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 <% else -%>
 http_port 80 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
-
-#prefer IPv4 until everything is upgraded
-dns_v4_first on
 <% end -%>
 
 cache_effective_user proxy
@@ -49,7 +46,11 @@ cache_replacement_policy heap LFUDA
 memory_replacement_policy heap GDSF
 
 server_persistent_connections on
+<% if node[:squid][:version] < 3 -%>
 persistent_request_timeout 1 minutes
+<% else -%>
+client_idle_pconn_timeout 1 minutes
+<% end -%>
 
 negative_ttl 15 seconds
 half_closed_clients off
@@ -64,7 +65,9 @@ request_timeout 90 seconds
 connect_timeout 20 seconds
 client_lifetime 1 hours
 
+<% if node[:squid][:version] < 4 -%>
 collapsed_forwarding on
+<% end -%>
 <% if node[:squid][:version] < 3 -%>
 refresh_stale_hit 300 seconds
 <% end -%>