Yet more rubucop cleanups

[chef.git] / cookbooks / git / recipes / server.rb

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index f8f0ef3d4cac2b571e1d4a1b4ae1a469f8d01db4..7361624c4d4a75ca374b0f1a952c8e64de18da47 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -61,7 +61,7 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     mode 0755
   end
 
-  if node[:recipes].include?("trace") and repository != "dns.git"
+  if node[:recipes].include?("trace") && repository != "dns.git"
     template "#{git_directory}/#{repository}/hooks/post-receive" do
       source "post-receive.erb"
       owner "root"
@@ -84,5 +84,5 @@ template "/etc/xinetd.d/git" do
   owner "root"
   group "root"
   mode 0644
-  notifies :reload, resources(:service => "xinetd")
+  notifies :reload, "service[xinetd]"
 end