From 8fc1d48820c7278ad111f4b965e71c08fc1f8a29 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 Jul 2021 17:17:48 +0100
Subject: [PATCH] Configure correct mapnik load path on updated tile servers

---
 cookbooks/tile/attributes/default.rb              | 1 +
 cookbooks/tile/templates/default/renderd.conf.erb | 2 +-
 roles/odin.rb                                     | 3 ++-
 roles/pyrene.rb                                   | 3 ++-
 roles/ysera.rb                                    | 3 ++-
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 7ad888fd0..019c86223 100644
--- 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 d02202d06..8f441db2c 100644
--- 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 238e403ae..ad003331c 100644
--- 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 7d03d02e3..64691d1c1 100644
--- 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 0428b24f8..0b219a8ee 100644
--- 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 => {
-- 
2.43.2