squid: disable forced syslog on 20.04

[chef.git] / cookbooks / squid / recipes / default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 37352b2c9bd42d555ea6859f59db81bdda693a0c..b46cafe3a84d430ef9d3bdbba2e347c98f458707 100644 (file)
--- 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]"