Bump file limits of Nginx and Squid processes from 64k ro 96k

[chef.git] / 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 89f8124836076e32855985567ad85614cef43f46..918c7b5314d5fed1a35f1bd2de1345f4addd47ba 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -3,7 +3,7 @@
 #FIXME - configurable
 cache_mem  <%= node[:squid][:cache_mem] %>
 
-max_filedescriptors 65536
+max_filedescriptors 98304
 
 #used by squidclient / munin
 http_port 3128
@@ -15,7 +15,7 @@ log_icp_queries off
 <% if node[:squid][:version] == "2" -%>
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 <% else -%>
-http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
+http_port 80 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
 
 #prefer IPv4 until everything is upgraded
 dns_v4_first on
@@ -113,6 +113,13 @@ cache_store_log none
 buffered_logs on
 client_db off
 strip_query_terms off
+<% if node[:squid][:version] == "3" -%>
+# Work around bug in squid 3 that causes log_fqdn to be
+# turned on by some of the (unused by us) default formats:
+# http://lists.squid-cache.org/pipermail/squid-users/2016-February/thread.html#8999
+url_rewrite_extras "%>a %un %>rm myip=%la myport=%lp"
+store_id_extras "%>a %un %>rm myip=%la myport=%lp"
+<% end -%>
 
 digest_generation on