]> git.openstreetmap.org Git - chef.git/commitdiff
Switch to using a dropin to customise squid service
authorTom Hughes <tom@compton.nu>
Tue, 23 Jun 2020 06:13:31 +0000 (07:13 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 23 Jun 2020 06:13:31 +0000 (07:13 +0100)
cookbooks/squid/recipes/default.rb

index 3b90afcb5442ddc84456e6571a6e070a42b2dad3..eb3876428f01a5ae97bb7209b126be5efe735b25 100644 (file)
@@ -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