From: Grant Slater <git@firefishy.com>
Date: Fri, 7 Aug 2020 01:10:51 +0000 (+0100)
Subject: squid: disable forced syslog on 20.04
X-Git-Url: https://git.openstreetmap.org./chef.git/commitdiff_plain/d10f22f0e472a3453f77e8539100f679f273fccb

squid: disable forced syslog on 20.04
---

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 37352b2c9..b46cafe3a 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -101,7 +101,7 @@ end
 squid_service_exec = if node[:lsb][:release].to_f < 20.04
                        "/usr/sbin/squid -YC"
                      else
-                       "/usr/sbin/squid --foreground -sYC"
+                       "/usr/sbin/squid --foreground -YC"
                      end
 
 systemd_service "squid" do
@@ -116,11 +116,6 @@ systemd_service "squid" do
   exec_start "#{squid_service_exec}"
 end
 
-# Quick hack to cleanup bloated journal
-execute "tmp_journal_clean_up" do
-  command "/bin/journalctl --vacuum-time=1d"
-end
-
 service "squid" do
   action :enable
   subscribes :restart, "systemd_service[squid]"