Don't try and fallback to alternate caches

[chef.git] / cookbooks / tilecache / templates / default / nginx_tile.conf.erb

diff --git a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
index 149ddd0018ede1b6b829c4e0c5bcdbb5523af6f8..f5ae62618053c8f8167c19ec1dc2751e872d546a 100644 (file)
--- a/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
+++ b/cookbooks/tilecache/templates/default/nginx_tile.conf.erb
@@ -2,14 +2,6 @@
 
 upstream tile_cache_backend {
     server 127.0.0.1:8080;
-    <% @caches.each do |cache| -%>
-    <% if cache[:hostname] != node[:hostname] -%>
-    #Server <%= cache[:hostname] %>
-    <% cache.ipaddresses(:family => :inet, :role => :external).sort.each do |address| -%>
-    server <%= address %> backup;
-    <% end -%>
-    <% end -%>
-    <% end -%>
 
     keepalive 32;
 }
@@ -104,3 +96,10 @@ server {
     server_name _;
     return 301 https://$host$request_uri;
 }
+
+server {
+    listen 80;
+    listen [::]:80;
+    server_name ~^(?<subdomain>(?:[a-d]\.)?tile)\.osm\.org$;
+    return 301 https://$subdomain.openstreetmap.org$request_uri;
+}