Merge remote-tracking branch 'github/pull/89'

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

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index c2aba251d1b84f7126125962e421650fe6b5a1b2..29f79d6935b5b5d8a81261a12efaf72a72cae95a 100644 (file)
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -33,7 +33,7 @@ end
 file "/etc/timezone" do
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   content "#{node[:tz]}\n"
   notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately
 end
@@ -47,7 +47,7 @@ template "/etc/ntp.conf" do
   source "ntp.conf.erb"
   owner "root"
   group "root"
-  mode 0644
+  mode 0o644
   notifies :restart, "service[ntp]"
 end
 
@@ -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_/) && !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