Let mod_tile handle CORS for the tile servers

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 4fdb67b8d9f9093e78415aa4deb503f62ac6d7dd..9199cb3a9e64412174f3b22fbf9e36ef3c60ce82 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -26,9 +26,6 @@
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 
   ErrorLog /var/log/apache2/error.log
   BufferedLogs on
 

-  # Set Access-Control-Allow-Origin header to allow Cross-origin resource sharing (CORS)
-  Header set Access-Control-Allow-Origin "*"
-

   # Enable the rewrite engine
   RewriteEngine on
 
   # Enable the rewrite engine
   RewriteEngine on
 

diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb
index f4abb6e3c2f82b4b5418ef326e1304e28c58ec9e..bb1a28c458d962724961c44ae853be4395c90aa6 100644 (file)
--- a/cookbooks/tile/templates/default/renderd.conf.erb
+++ b/cookbooks/tile/templates/default/renderd.conf.erb
@@ -18,4 +18,5 @@ XML=/srv/tile.openstreetmap.org/styles/<%= name %>/project.xml
 HOST=tile.openstreetmap.org
 MINZOOM=0
 MAXZOOM=<%= details[:max_zoom] %>
 HOST=tile.openstreetmap.org
 MINZOOM=0
 MAXZOOM=<%= details[:max_zoom] %>

+CORS=*

 <% end -%>
 <% end -%>