Merge remote-tracking branch 'tigerfell/pr257'

[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 4ce29d976ca88288f1f1ca6521cced0d9ed0ae83..8f441db2ca216269b8a627b85a1455861e02ad39 100644 (file)
--- a/cookbooks/tile/templates/default/renderd.conf.erb
+++ b/cookbooks/tile/templates/default/renderd.conf.erb
@@ -2,16 +2,12 @@
 
 [renderd]
 socketname=/var/run/renderd/renderd.sock
-num_threads=<%= node[:cpu][:total] - 2 %>
+num_threads=<%= node[:cpu][:total] - 1 %>
 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 -%>        
+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| -%>