Don't install the trac git hook on non-trac servers

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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 59ada04a8373ebeaeff86b77b11c1b591675ac91..f8f0ef3d4cac2b571e1d4a1b4ae1a469f8d01db4 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -18,6 +18,7 @@
 #
 
 include_recipe "networking"
+include_recipe "xinetd"
 
 git_directory = node[:git][:directory]
 
@@ -60,7 +61,7 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     mode 0755
   end
 
-  if repository != "dns.git"
+  if node[:recipes].include?("trace") and repository != "dns.git"
     template "#{git_directory}/#{repository}/hooks/post-receive" do
       source "post-receive.erb"
       owner "root"
@@ -77,3 +78,11 @@ template "/etc/cron.daily/git-backup" do
   group "root"
   mode 0755
 end
+
+template "/etc/xinetd.d/git" do
+  source "xinetd.erb"
+  owner "root"
+  group "root"
+  mode 0644
+  notifies :reload, resources(:service => "xinetd")
+end