X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5127e1fd6790edcb0ad3ef3c237808610b0e1f72..48dd1d495ac9aa21f88281492618998cb9c835de:/cookbooks/git/recipes/server.rb?ds=sidebyside

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index f8f0ef3d4..52d6304b0 100644
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -61,14 +61,14 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     mode 0755
   end
 
-  if node[:recipes].include?("trace") and repository != "dns.git"
-    template "#{git_directory}/#{repository}/hooks/post-receive" do
-      source "post-receive.erb"
-      owner "root"
-      group node[:git][:group]
-      mode 0755
-      variables :repository => "#{git_directory}/#{repository}"
-    end
+  next unless node[:recipes].include?("trac") && repository != "dns.git"
+
+  template "#{git_directory}/#{repository}/hooks/post-receive" do
+    source "post-receive.erb"
+    owner "root"
+    group node[:git][:group]
+    mode 0755
+    variables :repository => "#{git_directory}/#{repository}"
   end
 end
 
@@ -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