Configure correct mapnik load path on updated tile servers

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 7ad888fd0f45b232429a8b3ff0ac2375754cd9dc..019c862233ba8bd6c1e0003ac9ee6bd173d48bba 100644 (file)
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -1,5 +1,6 @@
 default[:tile][:database][:cluster] = "12/main"
 default[:tile][:database][:postgis] = "3"
+default[:tile][:database][:mapnik] = "3.0"
 default[:tile][:database][:node_file] = "/store/database/nodes"
 default[:tile][:database][:multi_geometry] = true
 default[:tile][:database][:hstore] = true

diff --git a/cookbooks/tile/templates/default/renderd.conf.erb b/cookbooks/tile/templates/default/renderd.conf.erb
index d02202d066d0ab656989a0c698df5d1ce090c994..8f441db2ca216269b8a627b85a1455861e02ad39 100644 (file)
--- a/cookbooks/tile/templates/default/renderd.conf.erb
+++ b/cookbooks/tile/templates/default/renderd.conf.erb
@@ -7,7 +7,7 @@ tile_dir=/srv/tile.openstreetmap.org/tiles
 stats_file=/var/run/renderd/renderd.stats
 
 [mapnik]
-plugins_dir=/usr/lib/mapnik/3.0/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| -%>

diff --git a/roles/odin.rb b/roles/odin.rb
index 238e403ae90f54ffd6174a20772a5a7b236b2f25..ad003331caa71d77e02683e0e7a5bc2d878fe5f3 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -48,7 +48,8 @@ default_attributes(
   :tile => {
     :database => {
       :cluster => "12/main",
-      :postgis => "3"
+      :postgis => "3",
+      :mapnik => "3.1"
     },
     :styles => {
       :default => {

diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index 7d03d02e3ae3b61539abfa3499db5b7c9b3ca672..64691d1c1c45d9a2c8664c05f7b3935ef1e4aae3 100644 (file)
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -57,7 +57,8 @@ default_attributes(
   :tile => {
     :database => {
       :cluster => "12/main",
-      :postgis => "3"
+      :postgis => "3",
+      :mapnik => "3.1"
     },
     :styles => {
       :default => {

diff --git a/roles/ysera.rb b/roles/ysera.rb
index 0428b24f8e3bc499cf25440ff5d0d868d52b3fd3..0b219a8eee81c806862613c17a89a2fcbbf9522a 100644 (file)
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -39,7 +39,8 @@ default_attributes(
   :tile => {
     :database => {
       :cluster => "12/main",
-      :postgis => "3"
+      :postgis => "3",
+      :mapnik => "3.1"
     },
     :styles => {
       :default => {