Fix mapnik version attribute

diff --git a/cookbooks/tile/attributes/default.rb b/cookbooks/tile/attributes/default.rb
index 019c862233ba8bd6c1e0003ac9ee6bd173d48bba..2336205d9e95f03ece9c0bb51cba6869ced72be8 100644 (file)
--- 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 ad003331caa71d77e02683e0e7a5bc2d878fe5f3..36929a7bb6bd85005a5b3159d21742cb4e5bb4ac 100644 (file)
--- 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 64691d1c1c45d9a2c8664c05f7b3935ef1e4aae3..ebc56ae9c6f44fa0e6171663ed825da634709265 100644 (file)
--- 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 0b219a8eee81c806862613c17a89a2fcbbf9522a..82e1d2d0e599502cd35ad93c825759122ce2aaa8 100644 (file)
--- 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 => [