Update piwik to 3.1.0

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

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index c2aba251d1b84f7126125962e421650fe6b5a1b2..cdf3b5a96ae4bafa892ddc19b1b772b026efe835 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"
 file "/etc/timezone" do
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   content "#{node[:tz]}\n"
   notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately
 end
   content "#{node[:tz]}\n"
   notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately
 end


@@ -47,11 +47,11 @@ template "/etc/ntp.conf" do
   source "ntp.conf.erb"
   owner "root"
   group "root"
   source "ntp.conf.erb"
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   notifies :restart, "service[ntp]"
 end
 
   notifies :restart, "service[ntp]"
 end
 

-munin_plugins = %w(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"
 
 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 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
     end
   end
 end