X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a5dc7f751b5bed6148ec59a63d2428d0bf6884e5..e41ce8527c0cc0e9a9984a8459cbd3dd508bdda3:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 3b90afcb5..deeff85b6 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -19,6 +19,7 @@
 
 include_recipe "apt"
 include_recipe "munin"
+include_recipe "prometheus"
 
 if node[:squid][:version] >= 3
   apt_package "squid" do
@@ -56,13 +57,13 @@ template "/etc/squid/squid.conf" do
   source "squid.conf.erb"
   owner "root"
   group "root"
-  mode 0o644
+  mode "644"
 end
 
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
-  mode 0o755
+  mode "755"
 end
 
 Array(node[:squid][:cache_dir]).each do |cache_dir|
@@ -75,7 +76,7 @@ Array(node[:squid][:cache_dir]).each do |cache_dir|
   directory cache_dir do
     owner "proxy"
     group "proxy"
-    mode 0o750
+    mode "750"
     recursive true
     notifies :restart, "service[squid]"
   end
@@ -90,31 +91,44 @@ end
 
 address_families = %w[AF_UNIX AF_INET AF_INET6]
 
+file "/etc/systemd/system/squid.service" do
+  action :delete
+end
+
+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 -YC"
+                     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
+  private_devices node[:squid][:private_devices]
   protect_system "full"
   protect_home true
   restrict_address_families address_families
   restart "always"
-  kill_mode "mixed"
+  exec_start "#{squid_service_exec}"
 end
 
 service "squid" do
-  action [:enable, :start]
+  action :enable
   subscribes :restart, "systemd_service[squid]"
   subscribes :restart, "template[/etc/squid/squid.conf]"
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 
+notify_group "squid-start" do
+  action :run
+  notifies :start, "service[squid]"
+end
+
 service "squid-restart" do
   service_name "squid"
   action :restart
@@ -139,3 +153,8 @@ end
 munin_plugin "squid_delay_pools_noreferer" do
   action :delete
 end
+
+prometheus_exporter "squid" do
+  port 9301
+  listen_switch "listen"
+end