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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 12b576aa1..9b4e06a45 100644
--- 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,41 +17,38 @@
 # limitations under the License.
 #
 
+node.default[:accounts][:users][:git][:status] = :role
+
+include_recipe "accounts"
+include_recipe "apt"
 include_recipe "networking"
 
 git_directory = node[:git][:directory]
 
 directory git_directory do
-  owner "git"
-  group "git"
-  mode 02775
+  owner "root"
+  group "root"
+  mode "775"
 end
 
-firewall_rule "accept-git" do
-  action :accept
-  source "net"
-  dest "fw"
-  proto "tcp:syn"
-  dest_ports "git"
-  source_ports "1024:"
+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
+
+Dir.glob("#{git_directory}/*/*.git").each do |repository|
+  template "#{repository}/hooks/post-update" do
     source "post-update.erb"
     owner "root"
-    group "git"
-    mode 0755
-  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
+    group node[:git][:group]
+    mode "755"
   end
 end
 
@@ -59,5 +56,5 @@ template "/etc/cron.daily/git-backup" do
   source "backup.cron.erb"
   owner "root"
   group "root"
-  mode 0755
+  mode "755"
 end