squid: use different exec_start based on ubuntu release

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index b526aa19026e9b91270d920b4e8dc84987b5e456..37352b2c9bd42d555ea6859f59db81bdda693a0c 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -98,6 +98,12 @@ file "/etc/logrotate.d/squid.dpkg-dist" do
   action :delete
 end
 
+squid_service_exec = if node[:lsb][:release].to_f < 20.04
+                       "/usr/sbin/squid -YC"
+                     else
+                       "/usr/sbin/squid --foreground -sYC"
+                     end
+
 systemd_service "squid" do
   dropin "chef"
   limit_nofile 98304
@@ -107,7 +113,12 @@ systemd_service "squid" do
   protect_home true
   restrict_address_families address_families
   restart "always"
-  ExecStart "/usr/sbin/squid --foreground -YC"
+  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