Make sure chef mysql configuration overrides defaults

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

diff --git a/cookbooks/git/recipes/server.rb b/cookbooks/git/recipes/server.rb
index 822467d08c59cc5030e6fe0dd86a0abef020425d..e87575c735dd560e9b0ead4e05365f075def2123 100644 (file)
--- a/cookbooks/git/recipes/server.rb
+++ b/cookbooks/git/recipes/server.rb
@@ -29,7 +29,7 @@ directory git_directory do
 end
 
 if node[:git][:allowed_nodes]
-  search(:node, node[:git][:allowed_nodes]).each do |n|
+  search(:node, node[:git][:allowed_nodes]).sort_by { |n| n[:fqdn] }.each do |n|
     n.interfaces(:role => :external).each do |interface|
       firewall_rule "accept-git" do
         action :accept
@@ -61,7 +61,7 @@ Dir.new(git_directory).select { |name| name =~ /\.git$/ }.each do |repository|
     mode 0o755
   end
 
-  next unless node[:recipes].include?("trac") && repository != "dns.git"
+  next unless node[:recipes].include?("trac") && repository != "dns.git" && repository != "chef.git"
 
   template "#{git_directory}/#{repository}/hooks/post-receive" do
     source "post-receive.erb"