From: Tom Hughes <tom@compton.nu>
Date: Sat, 9 Jul 2022 10:48:48 +0000 (+0100)
Subject: Set mapnik version to 3.1 everywhere as it's what we are using
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/dcdef4623982f888f381ade07bcf4e723335b6cc?ds=sidebyside

Set mapnik version to 3.1 everywhere as it's what we are using
---

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 1396f5cc6..ec7dc38a4 100644
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -6,7 +6,7 @@ default[:tile][:database][:hstore] = true
 default[:tile][:database][:style_file] = nil
 default[:tile][:database][:tag_transform_script] = nil
 
-default[:tile][:mapnik] = "3.0"
+default[:tile][:mapnik] = "3.1"
 
 default[:tile][:replication][:url] = "https://planet.osm.org/replication/minute/"
 
diff --git a/roles/albi.rb b/roles/albi.rb
index 21a4bcb6f..3e53363af 100644
--- a/roles/albi.rb
+++ b/roles/albi.rb
@@ -45,6 +45,7 @@ default_attributes(
       :cluster => "12/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/balerion.rb b/roles/balerion.rb
index bb7a23d70..2a168171a 100644
--- a/roles/balerion.rb
+++ b/roles/balerion.rb
@@ -40,6 +40,7 @@ default_attributes(
       :cluster => "12/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/bowser.rb b/roles/bowser.rb
index ee56703f9..8cc8954b6 100644
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -40,6 +40,7 @@ default_attributes(
       :cluster => "12/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/necrosan.rb b/roles/necrosan.rb
index 09cfdb118..5b4a67422 100644
--- a/roles/necrosan.rb
+++ b/roles/necrosan.rb
@@ -51,6 +51,7 @@ default_attributes(
       :cluster => "12/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/scorch.rb b/roles/scorch.rb
index 876fb6905..e201db984 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -63,6 +63,7 @@ default_attributes(
       :cluster => "12/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [