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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index eb3876428..fbfc1daef 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -56,13 +56,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 +75,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
@@ -94,6 +94,10 @@ file "/etc/systemd/system/squid.service" do
   action :delete
 end
 
+file "/etc/logrotate.d/squid.dpkg-dist" do
+  action :delete
+end
+
 systemd_service "squid" do
   dropin "chef"
   limit_nofile 98304
@@ -103,15 +107,26 @@ systemd_service "squid" do
   protect_home true
   restrict_address_families address_families
   restart "always"
+  exec_start "/usr/sbin/squid --foreground -YC"
+end
+
+# Quick hack to cleanup bloated journal
+execute "tmp_journal_clean_up" do
+  command "/bin/journalctl --vacuum-time=1d"
 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