Get rid of the last traces of old style apache auth directives

[chef.git] / cookbooks / tile / templates / default / renderd.conf.erb

diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb
index f4abb6e3c2f82b4b5418ef326e1304e28c58ec9e..4ce29d976ca88288f1f1ca6521cced0d9ed0ae83 100644 (file)
--- 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 -%>