From afec388815f9165661542a169ad3c19ee3d69b38 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 13 Jul 2021 17:33:11 +0100
Subject: [PATCH] Fix mapnik version attribute

---
 cookbooks/tile/attributes/default.rb | 3 ++-
 roles/odin.rb                        | 4 ++--
 roles/pyrene.rb                      | 4 ++--
 roles/ysera.rb                       | 4 ++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 019c86223..2336205d9 100644
--- a/cookbooks/tile/attributes/default.rb
+++ b/cookbooks/tile/attributes/default.rb
@@ -1,12 +1,13 @@
 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
 default[:tile][:database][:style_file] = nil
 default[:tile][:database][:tag_transform_script] = nil
 
+default[:tile][:mapnik] = "3.0"
+
 default[:tile][:replication][:url] = "https://planet.osm.org/replication/minute/"
 
 default[:tile][:data] = {}
diff --git a/roles/odin.rb b/roles/odin.rb
index ad003331c..36929a7bb 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -48,9 +48,9 @@ default_attributes(
   :tile => {
     :database => {
       :cluster => "12/main",
-      :postgis => "3",
-      :mapnik => "3.1"
+      :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index 64691d1c1..ebc56ae9c 100644
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -57,9 +57,9 @@ default_attributes(
   :tile => {
     :database => {
       :cluster => "12/main",
-      :postgis => "3",
-      :mapnik => "3.1"
+      :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
diff --git a/roles/ysera.rb b/roles/ysera.rb
index 0b219a8ee..82e1d2d0e 100644
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -39,9 +39,9 @@ default_attributes(
   :tile => {
     :database => {
       :cluster => "12/main",
-      :postgis => "3",
-      :mapnik => "3.1"
+      :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [
-- 
2.45.1