Sort tile cache addresses into a deterministic order (tile cookbook)

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 13ad6418d9cc584f01a0fd8154be1f4c799ba377..7b24c5c40b8629b59e25f0e9b7905a62292b54ca 100644 (file)
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -34,7 +34,7 @@ apache_module "tile" do
   conf "tile.conf.erb"
 end
 
-tilecaches = search(:node, "roles:tilecache")
+tilecaches = search(:node, "roles:tilecache").sort_by { |n| n[:hostname] }
 
 apache_site "default" do
   action [ :disable ]

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index ba3b704c6e2f0d1c337b195de3d8ed23d66b0d38..1ffa2323d278997acb302431563a25d17f096168 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -14,7 +14,7 @@
   # Get the real remote IP for requests via a trusted proxy
   RemoteIPHeader X-Forwarded-For
 <% @caches.each do |cache| -%>
-<% cache.ipaddresses(:role => :external) do |address| -%>
+<% cache.ipaddresses(:role => :external).sort.each do |address| -%>
   RemoteIPTrustedProxy <%= address %>
 <% end -%>
 <% end -%>