X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/7b9ec4b60ee39614d1d083d7220e76b07d2b275f..935838c4747aac13b9c626c8728b5bf1fd4d6e4d:/cookbooks/ntp/recipes/default.rb

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index d56804777..12447a28d 100644
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -35,7 +35,7 @@ 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
@@ -48,33 +48,15 @@ template "/etc/ntp.conf" do
   owner "root"
   group "root"
   mode 0644
-  notifies :restart, resources(:service => "ntp")
+  notifies :restart, "service[ntp]"
 end
 
-munin_plugins = []
+munin_plugins = [ "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|