X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/89562ec46a08430f7540fcb88209a6b042cf631b..be74b079f8bb9c7b2b7c0279a7d2f3a5621b1cb1:/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 b92ed1ec3..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
@@ -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
@@ -60,14 +60,18 @@ connect_timeout 20 seconds
 client_lifetime 1 hours
 
 collapsed_forwarding on
+<% if node[:squid][:version] == "2" -%>
 refresh_stale_hit 300 seconds
+<% end -%>
 
 #Recommended minimum configuration:
 #----------------------------------
+<% if node[:squid][:version] == "2" -%>
 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
 acl to_localhost dst 127.0.0.0/8
+<% end -%>
 acl SSL_ports port 443
 acl Safe_ports port 80          # http
 acl Safe_ports port 21          # ftp
@@ -109,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