X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a725f6d3959f30f6600026178192e5f237a1a805..4660134bb6aea893ad270e2cde04a63b3fb442ed:/cookbooks/squid/recipes/default.rb

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 6b2e25eff..5e07a4bdf 100644
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -56,13 +56,6 @@ template "/etc/squid/squid.conf" do
   mode 0o644
 end
 
-template "/etc/default/squid" do
-  source "squid.erb"
-  owner "root"
-  group "root"
-  mode 0o644
-end
-
 directory "/etc/squid/squid.conf.d" do
   owner "root"
   group "root"
@@ -109,8 +102,8 @@ end
 service "squid" do
   action [:enable, :start]
   subscribes :restart, "systemd_service[squid]"
+  subscribes :restart, "directory[#{cache_dir}]"
   subscribes :reload, "template[/etc/squid/squid.conf]"
-  subscribes :restart, "template[/etc/default/squid]"
   subscribes :reload, "template[/etc/resolv.conf]"
 end
 
@@ -132,7 +125,3 @@ munin_plugin "squid_icp"
 munin_plugin "squid_objectsize"
 munin_plugin "squid_requests"
 munin_plugin "squid_traffic"
-
-Dir.glob("/var/log/squid/zere.log*") do |log|
-  File.unlink(log)
-end