X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/57e0c47d7407d478228e107cf8c33591031617ac..b5977d65e97f6fcfccddefedf619de4902e45d31:/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 b5827e268..918c7b531 100644
--- 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
@@ -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