X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/19f60d1fb981a1eedacab6c87fcbc11e90695f78..1da276f1de78d846851a5dee6456b801a953bfd3:/cookbooks/git/recipes/server.rb

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 12b576aa1..59ada04a8 100644
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -22,25 +22,41 @@ include_recipe "networking"
 git_directory = node[:git][:directory]
 
 directory git_directory do
-  owner "git"
-  group "git"
+  owner node[:git][:user]
+  group node[:git][:group]
   mode 02775
 end
 
-firewall_rule "accept-git" do
-  action :accept
-  source "net"
-  dest "fw"
-  proto "tcp:syn"
-  dest_ports "git"
-  source_ports "1024:"
+if node[:git][:allowed_nodes]
+  search(:node, node[:git][:allowed_nodes]).each do |n|
+    n.interfaces(:role => :external).each do |interface|
+      firewall_rule "accept-git" do
+        action :accept
+        family interface[:family]
+        source "#{interface[:zone]}:#{interface[:address]}"
+        dest "fw"
+        proto "tcp:syn"
+        dest_ports "git"
+        source_ports "1024:"
+      end
+    end
+  end
+else
+  firewall_rule "accept-git" do
+    action :accept
+    source "net"
+    dest "fw"
+    proto "tcp:syn"
+    dest_ports "git"
+    source_ports "1024:"
+  end
 end
 
 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"
+    group node[:git][:group]
     mode 0755
   end
 
@@ -48,7 +64,7 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     template "#{git_directory}/#{repository}/hooks/post-receive" do
       source "post-receive.erb"
       owner "root"
-      group "git"
+      group node[:git][:group]
       mode 0755
       variables :repository => "#{git_directory}/#{repository}"
     end