From: Grant Slater <git@firefishy.com>
Date: Tue, 3 Dec 2019 22:25:48 +0000 (+0000)
Subject: squid: use systemd killmode mixed
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c10ad151524945b28847d3e4e3af96e24452ae84?hp=15219fdfa4b2d38fd413e91e5aab3d409449f26a

squid: use systemd killmode mixed

Move closer to upstream systemd config
See: https://github.com/squid-cache/squid/commit/d00e0e6d26acbd4c0c5e7b51f6b2900513282456#diff-d29c313433f1723d0bdd9664221014db
---

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index dae04ddeb..fcc5f337c 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -92,17 +92,17 @@ systemd_service "squid" do
   after ["network.target", "nss-lookup.target"]
   type "forking"
   limit_nofile 98304
-  exec_start_pre "/usr/sbin/squid -N -z"
-  exec_start "/usr/sbin/squid -Y"
-  exec_reload "/usr/sbin/squid -k reconfigure"
-  exec_stop "/usr/sbin/squid -k shutdown"
+  exec_start_pre "/usr/sbin/squid --foreground -z"
+  exec_start "/usr/sbin/squid -YC"
+  exec_reload "/bin/kill -HUP $MAINPID"
+  pid_file "/var/run/squid.pid"
   private_tmp true
   private_devices true
   protect_system "full"
   protect_home true
   restrict_address_families address_families
-  restart "on-failure"
-  timeout_sec 0
+  restart "always"
+  kill_mode "mixed"
 end
 
 service "squid" do