Update "latest" links for planet dump files

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 6452f67af5b71122f5cd9eb071d2630f975267dd..3fb9fcf89c05ebd00e4cb94b5c26c48dee3650c2 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -41,11 +41,14 @@ directory "/etc/squid/squid.conf.d" do
 end
 
 service "squid" do
-  action [ :enable, :start ]
+  if node[:lsb][:release].to_f >= 14.04
+    provider Chef::Provider::Service::Upstart
+  end
+   action [ :enable, :start ]
   supports :status => true, :restart => true, :reload => true
-  subscribes :reload, resources(:template => "/etc/squid/squid.conf")
-  subscribes :restart, resources(:template => "/etc/default/squid")
-  subscribes :reload, resources(:template => "/etc/resolv.conf")
+  subscribes :reload, "template[/etc/squid/squid.conf]"
+  subscribes :restart, "template[/etc/default/squid]"
+  subscribes :reload, "template[/etc/resolv.conf]"
 end
 
 munin_plugin "squid_cache"