X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/661556ea2d43e05e079275ec1dfe6e17b09f891e..17d8beb553e994ffae97f2112adc4c1c07e098b3:/cookbooks/tile/templates/default/apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 2f2488232..1ffa2323d 100644
--- 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 -%>
@@ -27,12 +27,10 @@
   # Enable the rewrite engine
   RewriteEngine on
 
-  # Rewrite tile status or tile dirty requests to default style
-  RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/status/?$  /default/$1/$2/$3.png/status [PT,T=text/plain,L]
-  RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/dirty/?$   /default/$1/$2/$3.png/dirty  [PT,T=text/plain,L]
-
   # Rewrite tile requests to the default style
   RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png$ /default/$1/$2/$3.png [PT,T=image/png,L]
+  RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/status/?$  /default/$1/$2/$3.png/status [PT,T=text/plain,L]
+  RewriteRule ^/(-?\d+)/(-?\d+)/(-?\d+)\.png/dirty/?$   /default/$1/$2/$3.png/dirty  [PT,T=text/plain,L]
 </VirtualHost>
 
 <Directory /srv/tile.openstreetmap.org/html>