X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/f24262ba0e7b60e922c8e2c56a8b77437fee8de2..76a92a578930347d2e7ef6a99a9ed7731b62e8b0:/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 ce2b23b9a..f250bb972 100644 --- 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; } @@ -102,6 +94,7 @@ server { listen 80 default_server; listen [::]:80 default_server; server_name _; + add_header Access-Control-Allow-Origin *; return 301 https://$host$request_uri; } @@ -109,5 +102,6 @@ server { listen 80; listen [::]:80; server_name ~^(?(?:[a-d]\.)?tile)\.osm\.org$; + add_header Access-Control-Allow-Origin *; return 301 https://$subdomain.openstreetmap.org$request_uri; }