X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3eab6dd1024f0750e15c3f0cb6f7a1230d1aca89..a19f9c4c8ce5cbc8b5b73d2d33de98bae686176b:/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 fbb07641f..61008078a 100644
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -1,33 +1,53 @@
 # DO NOT EDIT - This file is being maintained by Chef
 
-#configure host name
+# configure host name
 visible_hostname <%= node.name %>
 
-#FIXME - configurable
 cache_mem  <%= node[:squid][:cache_mem] %>
+<% if node[:squid][:version] > 2 -%>
+
+workers <%= [ node[:cpu][:total] - 2, 1 ].max.ceil %>
+cpu_affinity_map process_numbers=<%= (1..[ node[:cpu][:total] - 2, 1 ].max.ceil).to_a.join(',') %> cores=<%=(1..[ node[:cpu][:total] - 2, 1 ].max.ceil).to_a.join(',') %>
+
+# Set short clean shutdown interval
+shutdown_lifetime 2 seconds
+
+error_log_languages off
+<% end -%>
 
 max_filedescriptors 98304
 
-#used by squidclient / munin
+<% if node[:squid][:version] > 3 -%>
+# Use RFC6891 recommended max size
+dns_packet_max 4096 bytes
+# Use low initial retry interval (backoff start)
+dns_retransmit_interval 2 seconds
+# Set low timeout
+dns_timeout 15 seconds
+<% end -%>
+dns_v4_first on
+
+# used by squidclient / munin
 http_port 3128
-#ICP
+# HTCP
+htcp_port 4827
+# 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
+http_port 8080 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
 <% end -%>
 
 cache_effective_user proxy
 cache_effective_group proxy
 
-#FIXME - configurable
 <% 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 -%>
@@ -39,7 +59,7 @@ quick_abort_max 0 KB
 
 read_ahead_gap 64 KB
 
-maximum_object_size 1048576 bytes
+maximum_object_size 256 KB
 maximum_object_size_in_memory 64 KB
 
 cache_replacement_policy heap LFUDA
@@ -51,13 +71,13 @@ 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
@@ -65,15 +85,12 @@ 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:
-#----------------------------------
+# Recommended minimum configuration:
+# ----------------------------------
 <% if node[:squid][:version] < 3 -%>
 acl all src all
 acl manager proto cache_object
@@ -99,7 +116,7 @@ http_access allow manager
 http_access deny manager
 http_access deny !Safe_ports
 http_access deny CONNECT !SSL_ports
-#----------------------------------
+# ----------------------------------
 
 acl purge_hosts src 127.0.0.0/8
 acl PURGE method purge
@@ -118,7 +135,9 @@ 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 -%>
@@ -129,20 +148,21 @@ url_rewrite_extras "%>a %un %>rm myip=%la myport=%lp"
 store_id_extras "%>a %un %>rm myip=%la myport=%lp"
 <% end -%>
 
-digest_generation on
+digest_generation off
 
-refresh_pattern .		0	50%	8640
+refresh_pattern .		0	50%	20160
+refresh_pattern -i tile.openstreetmap.org 60 80% 20160 reload-into-ims
 
-#ZERO required for logrotate to work properly
+# ZERO required for logrotate to work properly
 logfile_rotate 0
 
 <% Dir.glob("/etc/squid/squid.conf.d/*.conf") do |file| -%>
 <%= File.read(file) %>
 <% end -%>
 
-#MUST BE LAST ACL
-#--------------
+# MUST BE LAST ACL
+# --------------
 http_access deny all
+htcp_access deny all
 icp_access deny all
-#--------------
-
+# --------------