Drop role and cookbook for the old tile CDN

[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 22b94ddec829140a56e08dbe4684b13ac2d53544..61008078a70535764f4182fc363e90afdf3f0bf9 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -9,6 +9,9 @@ cache_mem  <%= node[:squid][:cache_mem] %>
 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 -%>
 
@@ -22,6 +25,7 @@ dns_retransmit_interval 2 seconds
 # Set low timeout
 dns_timeout 15 seconds
 <% end -%>
+dns_v4_first on
 
 # used by squidclient / munin
 http_port 3128
@@ -34,7 +38,7 @@ log_icp_queries off
 <% 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
@@ -132,6 +136,8 @@ access_log daemon:<%= node[:squid][:access_log] %>
 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 -%>
@@ -142,7 +148,7 @@ 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%     20160
 refresh_pattern -i tile.openstreetmap.org 60 80% 20160 reload-into-ims