From 52722858a6bccd05484db3af0bc7580f01e5d1b1 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Fri, 30 Aug 2013 09:37:21 +0100
Subject: [PATCH] Let mod_tile handle CORS for the tile servers

---
 cookbooks/tile/templates/default/apache.erb       | 3 ---
 cookbooks/tile/templates/default/renderd.conf.erb | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 4fdb67b8d..9199cb3a9 100644
--- 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
 
-  # 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
 
diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb
index f4abb6e3c..bb1a28c45 100644
--- 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] %>
+CORS=*
 <% end -%>
-- 
2.43.2