X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e37fbb62e5a4f2851bf304344117983d9d251c96..1aa4dc4645246a750f53b37f383a4348f1065770:/cookbooks/git/recipes/server.rb?ds=sidebyside diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb index a287c6199..822467d08 100644 --- a/cookbooks/git/recipes/server.rb +++ b/cookbooks/git/recipes/server.rb @@ -25,7 +25,7 @@ git_directory = node[:git][:directory] directory git_directory do owner node[:git][:user] group node[:git][:group] - mode 02775 + mode 0o2775 end if node[:git][:allowed_nodes] @@ -58,17 +58,17 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository| source "post-update.erb" owner "root" group node[:git][:group] - mode 0755 + mode 0o755 end - if 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 + next unless node[:recipes].include?("trac") && repository != "dns.git" + + template "#{git_directory}/#{repository}/hooks/post-receive" do + source "post-receive.erb" + owner "root" + group node[:git][:group] + mode 0o755 + variables :repository => "#{git_directory}/#{repository}" end end @@ -76,13 +76,13 @@ template "/etc/cron.daily/git-backup" do source "backup.cron.erb" owner "root" group "root" - mode 0755 + mode 0o755 end template "/etc/xinetd.d/git" do source "xinetd.erb" owner "root" group "root" - mode 0644 - notifies :reload, resources(:service => "xinetd") + mode 0o644 + notifies :reload, "service[xinetd]" end