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 d5680477721b33f4b1f55a342aa3c0fd20c51b1c..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"
 file "/etc/timezone" do
   owner "root"
   group "root"

-  mode 0644
+  mode 0o644

   content "#{node[:tz]}\n"
   content "#{node[:tz]}\n"

-  notifies :run, resources(:execute => "dpkg-reconfigure-tzdata"), :immediately
+  notifies :run, "execute[dpkg-reconfigure-tzdata]", :immediately

 end
 
 service "ntp" do
 end
 
 service "ntp" do

-  action [ :enable, :start ]
+  action [:enable, :start]

   supports :status => true, :restart => true
 end
 
   supports :status => true, :restart => true
 end
 


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

-  mode 0644
-  notifies :restart, resources(:service => "ntp")
+  mode 0o644
+  notifies :restart, "service[ntp]"

 end
 
 end
 

-munin_plugins = []
+munin_plugins = %w(ntp_kernel_err ntp_kernel_pll_freq ntp_kernel_pll_off ntp_offset)

 
 

-if node[:lsb][:release].to_f <= 8.04
-  munin_plugins = [ "ntp_states" ]
-
-  node[:ntp][:servers].each do |name|
-    name = Socket.gethostbyname(name)[0].gsub!(/[.-]/, "_")
-
-    munin_plugin "ntp_#{name}" do
-      target "ntp_"
-    end
-
-    munin_plugins.push("ntp_#{name}")
-  end
-
-  munin_plugin "ntp_states"
-else
-  munin_plugins = [ "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_pll_off"
-  munin_plugin "ntp_offset"
-end
+munin_plugin "ntp_kernel_err"
+munin_plugin "ntp_kernel_pll_freq"
+munin_plugin "ntp_kernel_pll_off"
+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_/) 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
     end
   end
 end