Configure host name for squid caches

[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..0b8189d3308cb8e38ca810c4e6a03bc79e7bfff9 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -1,9 +1,12 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
+#configure host name
+visible_hostname <%= node.name %>
+
 #FIXME - configurable
 cache_mem  <%= node[:squid][:cache_mem] %>
 
-max_filedescriptors 65536
+max_filedescriptors 98304
 
 #used by squidclient / munin
 http_port 3128
@@ -12,10 +15,10 @@ icp_port 3130
 log_icp_queries off
 
 #FIXME - configurable
-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>
 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
@@ -25,8 +28,10 @@ cache_effective_user proxy
 cache_effective_group proxy
 
 #FIXME - configurable
-cache_dir <%= node[:squid][:cache_dir] %>
-<% if node[:squid][:version] == "2" -%>
+<% Array(node[:squid][:cache_dir]).each do |cache_dir| -%>
+cache_dir <%= cache_dir %>
+<% end -%>
+<% if node[:squid][:version] < 3 -%>
 cache_swap_log /var/spool/squid/%s
 <% end -%>
 
@@ -48,7 +53,7 @@ persistent_request_timeout 1 minutes
 
 negative_ttl 15 seconds
 half_closed_clients off
-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>
 pipeline_prefetch on
 <% else -%>
 pipeline_prefetch 1
@@ -60,13 +65,13 @@ connect_timeout 20 seconds
 client_lifetime 1 hours
 
 collapsed_forwarding on
-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>
 refresh_stale_hit 300 seconds
 <% end -%>
 
 #Recommended minimum configuration:
 #----------------------------------
-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>
 acl all src all
 acl manager proto cache_object
 acl localhost src 127.0.0.1/32
@@ -101,7 +106,7 @@ http_access deny purge
 forwarded_for on
 follow_x_forwarded_for allow localhost
 
-<% if node[:squid][:version] == "2" -%>
+<% if node[:squid][:version] < 3 -%>
 logformat openstreetmap %ts.%03tu %tr %>a %Ss/%03Hs %<st %rm %rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"
 access_log <%= node[:squid][:access_log] %>
 <% else -%>
@@ -113,6 +118,13 @@ cache_store_log none
 buffered_logs on
 client_db off
 strip_query_terms off
+<% if node[:squid][:version] > 2 -%>
+# 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