X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3eab6dd1024f0750e15c3f0cb6f7a1230d1aca89..f2e8efe99b471cd5aef85977e6b22d024151c9a4:/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..e6fd9bdd6 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -5,11 +5,19 @@ 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
 
 #used by squidclient / munin
 http_port 3128
+#HTCP
+htcp_port 4827
 #ICP
 icp_port 3130
 log_icp_queries off
@@ -51,6 +59,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
@@ -143,6 +154,7 @@ logfile_rotate 0
 #MUST BE LAST ACL
 #--------------
 http_access deny all
+htcp_access deny all
 icp_access deny all
 #--------------