From c33816ceeb4207ddef0e7986b3c362ade95afe7f Mon Sep 17 00:00:00 2001
From: Grant Slater <git@firefishy.com>
Date: Fri, 3 Jul 2020 05:34:23 +0100
Subject: [PATCH] squid: remove broken logrotate file + no cache digest

---
 cookbooks/squid/recipes/default.rb               | 4 ++++
 cookbooks/squid/templates/default/squid.conf.erb | 3 +--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index ff2a6a425..78741e3e2 100644
--- 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
 
+file "/etc/logrotate.d/squid.dpkg-dist" do
+  action :delete
+end
+
 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 a65436c45..ad1732bb7 100644
--- 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 -%>
-# 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 -%>
 
@@ -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 -%>
 
-digest_generation on
+digest_generation off
 
 refresh_pattern .		0	50%	20160
 refresh_pattern -i tile.openstreetmap.org 60 80% 20160 reload-into-ims
-- 
2.43.2