squid: remove broken logrotate file + no cache digest

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index ff2a6a4257079f95c691ef7a21c0c5eb83a29f15..78741e3e2f2ad8aa0f728a9080ad10868bddef52 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -94,6 +94,10 @@ file "/etc/systemd/system/squid.service" do
   action :delete
 end
 
   action :delete
 end
 

+file "/etc/logrotate.d/squid.dpkg-dist" do
+  action :delete
+end
+

 systemd_service "squid" do
   dropin "chef"
   limit_nofile 98304
 systemd_service "squid" do
   dropin "chef"
   limit_nofile 98304

diff --git a/cookbooks/squid/templates/default/squid.conf.erb b/cookbooks/squid/templates/default/squid.conf.erb
index a65436c45aef31fcc907cb1aae1c8c489d51f71c..ad1732bb7fb22cda2b308b56c31919aa7f9bf552 100644 (file)
--- a/cookbooks/squid/templates/default/squid.conf.erb
+++ b/cookbooks/squid/templates/default/squid.conf.erb
@@ -38,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 -%>
 


@@ -147,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