X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f7eea382e7a2a4964cc97251bc7ab977bddb7b95..03076d817465c2f09d1e611773b4e5f0d0196ab6:/cookbooks/git/recipes/server.rb

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 4f537e62d..e87575c73 100644
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -18,17 +18,18 @@
 #
 
 include_recipe "networking"
+include_recipe "xinetd"
 
 git_directory = node[:git][:directory]
 
 directory git_directory do
-  owner "git"
-  group "git"
-  mode 02775
+  owner node[:git][:user]
+  group node[:git][:group]
+  mode 0o2775
 end
 
 if node[:git][:allowed_nodes]
-  search(:node, node[:git][:allowed_nodes]).each do |n|
+  search(:node, node[:git][:allowed_nodes]).sort_by { |n| n[:fqdn] }.each do |n|
     n.interfaces(:role => :external).each do |interface|
       firewall_rule "accept-git" do
         action :accept
@@ -56,18 +57,18 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
   template "#{git_directory}/#{repository}/hooks/post-update" do
     source "post-update.erb"
     owner "root"
-    group "git"
-    mode 0755
+    group node[:git][:group]
+    mode 0o755
   end
 
-  if repository != "dns.git"
-    template "#{git_directory}/#{repository}/hooks/post-receive" do
-      source "post-receive.erb"
-      owner "root"
-      group "git"
-      mode 0755
-      variables :repository => "#{git_directory}/#{repository}"
-    end
+  next unless node[:recipes].include?("trac") && repository != "dns.git" && repository != "chef.git"
+
+  template "#{git_directory}/#{repository}/hooks/post-receive" do
+    source "post-receive.erb"
+    owner "root"
+    group node[:git][:group]
+    mode 0o755
+    variables :repository => "#{git_directory}/#{repository}"
   end
 end
 
@@ -75,5 +76,13 @@ template "/etc/cron.daily/git-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode 0o755
+end
+
+template "/etc/xinetd.d/git" do
+  source "xinetd.erb"
+  owner "root"
+  group "root"
+  mode 0o644
+  notifies :reload, "service[xinetd]"
 end