squid: remove broken logrotate file + no cache digest

[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 940eaae3f82dc85da8c269d7bdccabb818768253..ad1732bb7fb22cda2b308b56c31919aa7f9bf552 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -25,6 +25,7 @@ dns_retransmit_interval 2 seconds
 # Set low timeout
 dns_timeout 15 seconds
 <% end -%>
 # Set low timeout
 dns_timeout 15 seconds
 <% end -%>

+dns_v4_first on

 
 # used by squidclient / munin
 http_port 3128
 
 # used by squidclient / munin
 http_port 3128


@@ -37,7 +38,6 @@ log_icp_queries off
 <% if node[:squid][:version] < 3 -%>
 http_port 80 accel defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6 http11
 <% else -%>
 <% 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 -%>
 
 http_port 8080 accel no-vhost defaultsite=tile.openstreetmap.org tcpkeepalive=60,10,6
 <% end -%>
 


@@ -146,7 +146,7 @@ url_rewrite_extras "%>a %un %>rm myip=%la myport=%lp"
 store_id_extras "%>a %un %>rm myip=%la myport=%lp"
 <% end -%>
 
 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
 
 refresh_pattern .              0       50%     20160
 refresh_pattern -i tile.openstreetmap.org 60 80% 20160 reload-into-ims