From: Tom Hughes <tom@compton.nu>
Date: Tue, 23 Jun 2020 06:13:31 +0000 (+0100)
Subject: Switch to using a dropin to customise squid service
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/d07124be080682806659d39ee412dcb4fd5afcad

Switch to using a dropin to customise squid service
---

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 3b90afcb5..eb3876428 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -90,22 +90,19 @@ end
 
 address_families = %w[AF_UNIX AF_INET AF_INET6]
 
+file "/etc/systemd/system/squid.service" do
+  action :delete
+end
+
 systemd_service "squid" do
-  description "Squid caching proxy"
-  after ["network.target", "nss-lookup.target"]
-  type "forking"
+  dropin "chef"
   limit_nofile 98304
-  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 "always"
-  kill_mode "mixed"
 end
 
 service "squid" do