Simplify management of nodes file permission now CHEF#1260 is fixed

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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 66f4dd1fc01a558228dcd7025fde6b5d59ffb10a..66efbb1465627b6cf1dfd3fcb2dfcec16c46ece2 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -17,62 +17,55 @@
 # limitations under the License.
 #
 
-include_recipe "apache"
 include_recipe "networking"
-
-package "gitweb"
-
-apache_module "rewrite"
+include_recipe "xinetd"
 
 git_directory = node[:git][:directory]
 
 directory git_directory do
-  owner "git"
-  group "git"
+  owner node[:git][:user]
+  group node[:git][:group]
   mode 02775
 end
 
-template "/etc/gitweb.conf" do
-  source "gitweb.conf.erb"
-  owner "root"
-  group "root"
-  mode 0644
-end
-
-apache_site node[:git][:host] do
-  template "apache.erb"
-  directory git_directory
-end
-
-template "#{git_directory}/robots.txt" do
-  source "robots.txt.erb"
-  owner "root"
-  group "root"
-  mode 0644
-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
 
-  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"
-      group "git"
+      group node[:git][:group]
       mode 0755
       variables :repository => "#{git_directory}/#{repository}"
     end
@@ -85,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, "service[xinetd]"
+end