Add new stateofthemap site for 2016

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

diff --git a/cookbooks/squid/recipes/default.rb b/cookbooks/squid/recipes/default.rb
index 3fb9fcf89c05ebd00e4cb94b5c26c48dee3650c2..aedc8923ff5b393a9b58ae776e23a332ce24b646 100644 (file)
--- a/cookbooks/squid/recipes/default.rb
+++ b/cookbooks/squid/recipes/default.rb
@@ -41,10 +41,8 @@ directory "/etc/squid/squid.conf.d" do
 end
 
 service "squid" do
 end
 
 service "squid" do

-  if node[:lsb][:release].to_f >= 14.04
-    provider Chef::Provider::Service::Upstart
-  end
-   action [ :enable, :start ]
+  provider Chef::Provider::Service::Upstart
+  action [:enable, :start]

   supports :status => true, :restart => true, :reload => true
   subscribes :reload, "template[/etc/squid/squid.conf]"
   subscribes :restart, "template[/etc/default/squid]"
   supports :status => true, :restart => true, :reload => true
   subscribes :reload, "template[/etc/squid/squid.conf]"
   subscribes :restart, "template[/etc/default/squid]"