Remove xapi role.

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

diff --git a/cookbooks/ntp/recipes/default.rb b/cookbooks/ntp/recipes/default.rb
index 077fd7ac2d2274bd5b59d049a639e22c1c38492d..96e6c2cafcec3238085435d816a46a154a32d5ab 100644 (file)
--- a/cookbooks/ntp/recipes/default.rb
+++ b/cookbooks/ntp/recipes/default.rb
@@ -39,7 +39,7 @@ file "/etc/timezone" do
 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
 


@@ -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