Merge remote-tracking branch 'tigerfell/pr257'

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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index f8f0ef3d4cac2b571e1d4a1b4ae1a469f8d01db4..bd586e9f2c0e34165aef4fedced19cbee48bf76a 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -1,14 +1,14 @@
 #
-# Cookbook Name:: git
+# Cookbook:: git
 # Recipe:: server
 #
-# Copyright 2011, OpenStreetMap Foundation
+# Copyright:: 2011, OpenStreetMap Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
-#     http://www.apache.org/licenses/LICENSE-2.0
+#     https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,58 +17,45 @@
 # limitations under the License.
 #
 
+node.default[:accounts][:users][:git][:status] = :role
+
+include_recipe "accounts"
+include_recipe "apt"
 include_recipe "networking"
-include_recipe "xinetd"
 
 git_directory = node[:git][:directory]
 
 directory git_directory do
-  owner node[:git][:user]
-  group node[:git][:group]
-  mode 02775
+  owner "root"
+  group "root"
+  mode "775"
 end
 
-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
+directory "#{git_directory}/public" do
+  owner node[:git][:public_user]
+  group node[:git][:public_group]
+  mode "2775"
 end
 
-Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
-  template "#{git_directory}/#{repository}/hooks/post-update" do
+directory "#{git_directory}/private" do
+  owner node[:git][:private_user]
+  group node[:git][:private_group]
+  mode "2775"
+end
+
+template "/etc/gitconfig" do
+  source "gitconfig.erb"
+  owner "root"
+  group "root"
+  mode "644"
+end
+
+Dir.glob("#{git_directory}/*/*.git").each do |repository|
+  template "#{repository}/hooks/post-update" do
     source "post-update.erb"
     owner "root"
     group node[:git][:group]
-    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
+    mode "755"
   end
 end
 
@@ -76,13 +63,5 @@ template "/etc/cron.daily/git-backup" do
   source "backup.cron.erb"
   owner "root"
   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")
+  mode "755"
 end