X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5232219867a768acea6c943fdd99126a6d8f7098..e88020178b6617b163bafb500a6cf2d1ab79428d:/cookbooks/git/recipes/server.rb diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb index 66f4dd1fc..81b16952f 100644 --- a/cookbooks/git/recipes/server.rb +++ b/cookbooks/git/recipes/server.rb @@ -8,7 +8,7 @@ # 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,65 +17,34 @@ # limitations under the License. # -include_recipe "apache" include_recipe "networking" -package "gitweb" - -apache_module "rewrite" - git_directory = node[:git][:directory] directory git_directory do - owner "git" - group "git" - 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 + mode 0o775 end -template "#{git_directory}/robots.txt" do - source "robots.txt.erb" - owner "root" - group "root" - mode 0644 +directory "#{git_directory}/public" do + owner node[:git][:public_user] + group node[:git][:public_group] + mode 0o2775 end -firewall_rule "accept-git" do - action :accept - source "net" - dest "fw" - proto "tcp:syn" - dest_ports "git" - source_ports "1024:" +directory "#{git_directory}/private" do + owner node[:git][:private_user] + group node[:git][:private_group] + mode 0o2775 end -Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository| - template "#{git_directory}/#{repository}/hooks/post-update" do +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 0o755 end end @@ -83,5 +52,5 @@ template "/etc/cron.daily/git-backup" do source "backup.cron.erb" owner "root" group "root" - mode 0755 + mode 0o755 end