X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d8fc1ec5f984b7ab6a7886e054c9dd272d3678b1..6766749acda8c73f24cdb134f697f24942bfe50f:/cookbooks/tile/templates/default/renderd.conf.erb?ds=sidebyside

diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb
index f4abb6e3c..4ce29d976 100644
--- a/cookbooks/tile/templates/default/renderd.conf.erb
+++ b/cookbooks/tile/templates/default/renderd.conf.erb
@@ -7,7 +7,11 @@ tile_dir=/srv/tile.openstreetmap.org/tiles
 stats_file=/var/run/renderd/renderd.stats
 
 [mapnik]
+<% if node[:lsb][:release].to_f >= 14.04 -%>
+plugins_dir=/usr/lib/mapnik/2.2/input
+<% else -%>        
 plugins_dir=/usr/lib/mapnik/input
+<% end -%>        
 font_dir=/usr/share/fonts
 font_dir_recurse=true
 <% node[:tile][:styles].each do |name,details| -%>
@@ -18,4 +22,5 @@ XML=/srv/tile.openstreetmap.org/styles/<%= name %>/project.xml
 HOST=tile.openstreetmap.org
 MINZOOM=0
 MAXZOOM=<%= details[:max_zoom] %>
+CORS=*
 <% end -%>