X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/42f2f59723dcb9d3ee30bc5879744047a962c41a..6dfd80597e04b334ebf3acd897cf8783ce6b4090:/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 817fd5072..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 @@ -146,6 +154,7 @@ logfile_rotate 0 #MUST BE LAST ACL #-------------- http_access deny all +htcp_access deny all icp_access deny all #--------------