X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3eab6dd1024f0750e15c3f0cb6f7a1230d1aca89..a5a3b8b5d676e4e7c46f5124325d2ca799bee76f:/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 fbb07641f..51dc0b63e 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -5,6 +5,12 @@ visible_hostname <%= node.name %>
 
 #FIXME - configurable
 cache_mem  <%= node[:squid][:cache_mem] %>
+<% if node[:squid][:version] > 2 -%>
+
+workers <%= node[:cpu][:total] %>
+
+error_log_languages off
+<% end -%>
 
 max_filedescriptors 98304
 
@@ -51,6 +57,9 @@ 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