Switch remaining PHP sites to use FPM

[chef.git] / cookbooks / squid / recipes / default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index eb3876428f01a5ae97bb7209b126be5efe735b25..78741e3e2f2ad8aa0f728a9080ad10868bddef52 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -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
@@ -106,12 +110,17 @@ systemd_service "squid" do
 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