X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a440b3e8d77d798ec4a67645d934cd0f817893dd..0ef75fc789f0cfe4d602b9c79d5f50c1293088fc:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 8e7b4ad8b..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
@@ -98,21 +99,22 @@ 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
   dropin "chef"
   limit_nofile 98304
   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"
-  ExecStart "/usr/sbin/squid --foreground -YC"
-end
-
-# Quick hack to cleanup bloated journal
-execute "tmp_journal_clean_up" do
-  command "/bin/journalctl --vacuum-time=1d"
+  exec_start "#{squid_service_exec}"
 end
 
 service "squid" do
@@ -151,3 +153,8 @@ end
 munin_plugin "squid_delay_pools_noreferer" do
   action :delete
 end
+
+prometheus_exporter "squid" do
+  port 9301
+  listen_switch "listen"
+end