X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5c5ffa21ddcce610d5bbf7b3885b08497e85dac4..0ef6aafef4b54ce79fe84eb44ff058f37e807d74:/cookbooks/ntp/recipes/default.rb

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 938aa47ac..96e6c2caf 100644
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -35,11 +35,11 @@ file "/etc/timezone" do
   group "root"
   mode 0644
   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
 
@@ -48,10 +48,10 @@ template "/etc/ntp.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "ntp")
+  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