Add new Amsterdam IPv6 addresses to ACLs

[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 ebd8c14eb1ef756647dbbccd6bb97fd146e6bdd0..d29c58aa7728f9512a6fe22d2dac67269319ed9e 100644 (file)
--- a/cookbooks/tile/templates/default/renderd.conf.erb
+++ b/cookbooks/tile/templates/default/renderd.conf.erb
@@ -2,12 +2,12 @@
 
 [renderd]
 socketname=/var/run/renderd/renderd.sock
 
 [renderd]
 socketname=/var/run/renderd/renderd.sock

-num_threads=<%= node[:cpu][:total] - 2 %>
+num_threads=<%= node.cpu_cores - 1 %>

 tile_dir=/srv/tile.openstreetmap.org/tiles
 stats_file=/var/run/renderd/renderd.stats
 
 [mapnik]
 tile_dir=/srv/tile.openstreetmap.org/tiles
 stats_file=/var/run/renderd/renderd.stats
 
 [mapnik]

-plugins_dir=/usr/lib/mapnik/input
+plugins_dir=/usr/lib/mapnik/<%= node[:tile][:mapnik] %>/input

 font_dir=/usr/share/fonts
 font_dir_recurse=true
 <% node[:tile][:styles].each do |name,details| -%>
 font_dir=/usr/share/fonts
 font_dir_recurse=true
 <% node[:tile][:styles].each do |name,details| -%>


@@ -16,4 +16,7 @@ font_dir_recurse=true
 URI=/<%= name %>/
 XML=/srv/tile.openstreetmap.org/styles/<%= name %>/project.xml
 HOST=tile.openstreetmap.org
 URI=/<%= name %>/
 XML=/srv/tile.openstreetmap.org/styles/<%= name %>/project.xml
 HOST=tile.openstreetmap.org

+MINZOOM=0
+MAXZOOM=<%= details[:max_zoom] %>
+CORS=*

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