X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/1c848471a16f9d1ee1fc8a327af110447ea1ef4c..a5a3b8b5d676e4e7c46f5124325d2ca799bee76f:/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 72ff97740..51dc0b63e 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -1,22 +1,44 @@
 # 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] %>
+<% if node[:squid][:version] > 2 -%>
+
+workers <%= node[:cpu][:total] %>
+
+error_log_languages off
+<% end -%>
 
-max_filedescriptors 65536
+max_filedescriptors 98304
 
 #used by squidclient / munin
-http_port 127.0.0.1:3128
+http_port 3128
+#ICP
+icp_port 3130
+log_icp_queries off
 
 #FIXME - configurable
+<% if node[:squid][:version] < 3 -%>
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
+<% else -%>
+http_port 80 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
+<% end -%>
 
 cache_effective_user proxy
 cache_effective_group proxy
 
 #FIXME - configurable
-cache_dir <%= node[:squid][:cache_dir] %>
+<% 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 -%>
+
+cache_mgr webmaster@openstreetmap.org
 
 quick_abort_min 0 KB
 quick_abort_max 0 KB
@@ -30,26 +52,43 @@ cache_replacement_policy heap LFUDA
 memory_replacement_policy heap GDSF
 
 server_persistent_connections on
+<% if node[:squid][:version] < 3 -%>
 persistent_request_timeout 1 minutes
+<% else -%>
+client_idle_pconn_timeout 1 minutes
+<% end -%>
+<% if node[:squid][:version] > 3 -%>
+pconn_lifetime 5 minutes
+<% end -%>
 
 negative_ttl 15 seconds
 half_closed_clients off
+<% if node[:squid][:version] < 3 -%>
 pipeline_prefetch on
+<% else -%>
+pipeline_prefetch 1
+<% end -%>
 
 read_timeout 90 seconds
 request_timeout 90 seconds
 connect_timeout 20 seconds
 client_lifetime 1 hours
 
+<% if node[:squid][:version] < 4 -%>
 collapsed_forwarding on
+<% end -%>
+<% if node[:squid][:version] < 3 -%>
 refresh_stale_hit 300 seconds
+<% end -%>
 
 #Recommended minimum configuration:
 #----------------------------------
+<% if node[:squid][:version] < 3 -%>
 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
@@ -77,17 +116,31 @@ http_access allow purge purge_hosts
 http_access deny purge
 
 forwarded_for on
+follow_x_forwarded_for allow localhost
 
+<% 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 -%>
+logformat openstreetmap %ts.%03tu %tr %>a %Ss/%03>Hs %<st %rm %>rp %Sh/%<A %mt "%{Referer}>h" "%{User-Agent}>h"
+access_log daemon:<%= node[:squid][:access_log] %>
+<% end -%>
 cache_log /var/log/squid/cache.log
 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 off
+digest_generation on
 
-refresh_pattern .		0	20%	4320
+refresh_pattern .		0	50%	8640
 
 #ZERO required for logrotate to work properly
 logfile_rotate 0