X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/62fcbc62cf21f2ee0f962b742933abc350934c04..42f2f59723dcb9d3ee30bc5879744047a962c41a:/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 2861daa92..817fd5072 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,14 @@ 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 -%> +<% if node[:squid][:version] > 3 -%> +pconn_lifetime 5 minutes +<% end -%> negative_ttl 15 seconds half_closed_clients off