Fix use of deprecated features

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

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 938aa47aca72f4b5bb52762c9e963df993d9abe2..29f79d6935b5b5d8a81261a12efaf72a72cae95a 100644 (file)
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -33,13 +33,13 @@ end
 file "/etc/timezone" do
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   content "#{node[:tz]}\n"
-  notifies :run, resources(:execute => "dpkg-reconfigure-tzdata"), :immediately
+  notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately
 end
 
 service "ntp" do
-  action [ :enable, :start ]
+  action [:enable, :start]
   supports :status => true, :restart => true
 end
 
@@ -47,11 +47,11 @@ template "/etc/ntp.conf" do
   source "ntp.conf.erb"
   owner "root"
   group "root"
-  mode 0644
-  notifies :restart, resources(:service => "ntp")
+  mode 0o644
+  notifies :restart, "service[ntp]"
 end
 
-munin_plugins = [ "ntp_kernel_err", "ntp_kernel_pll_freq", "ntp_kernel_pll_off", "ntp_offset" ]
+munin_plugins = %w(ntp_kernel_err ntp_kernel_pll_freq ntp_kernel_pll_off ntp_offset)
 
 munin_plugin "ntp_kernel_err"
 munin_plugin "ntp_kernel_pll_freq"
@@ -60,10 +60,10 @@ munin_plugin "ntp_offset"
 
 if File.directory?("/etc/munin/plugins")
   Dir.new("/etc/munin/plugins").each do |plugin|
-    if plugin.match(/^ntp_/) and not munin_plugins.include?(plugin)
-      munin_plugin plugin do
-        action :delete
-      end
+    next unless plugin.match(/^ntp_/) && !munin_plugins.include?(plugin)
+
+    munin_plugin plugin do
+      action :delete
     end
   end
 end