From 4378e24ae196a1ff6af4f9994dcc54425498f7ba Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Tue, 31 Mar 2020 08:10:08 +0100
Subject: [PATCH] Update rhaegal to postgres 12, postgis 3 and carto 5.0.0

---
 roles/albi.rb    | 1 -
 roles/bowser.rb  | 1 -
 roles/odin.rb    | 1 -
 roles/pyrene.rb  | 1 -
 roles/rhaegal.rb | 4 ++--
 roles/scorch.rb  | 1 -
 roles/tile.rb    | 2 +-
 roles/ysera.rb   | 1 -
 8 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/roles/albi.rb b/roles/albi.rb
index 296497906..21a4bcb6f 100644
--- a/roles/albi.rb
+++ b/roles/albi.rb
@@ -47,7 +47,6 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
diff --git a/roles/bowser.rb b/roles/bowser.rb
index 17c9f548d..9a30ff3cf 100644
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -42,7 +42,6 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
diff --git a/roles/odin.rb b/roles/odin.rb
index abe2780ff..238e403ae 100644
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -52,7 +52,6 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
diff --git a/roles/pyrene.rb b/roles/pyrene.rb
index eb500013d..0f6cd953e 100644
--- a/roles/pyrene.rb
+++ b/roles/pyrene.rb
@@ -51,7 +51,6 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index cda8a602f..8049ab4c7 100644
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -63,8 +63,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "12/main",
+      :postgis => "3"
     },
     :styles => {
       :default => {
diff --git a/roles/scorch.rb b/roles/scorch.rb
index 8378856ee..876fb6905 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -65,7 +65,6 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
diff --git a/roles/tile.rb b/roles/tile.rb
index d726d29d1..6ae1a09c0 100644
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -107,7 +107,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "https://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v4.25.0",
+        :revision => "v5.0.0",
         :max_zoom => 19
       }
     }
diff --git a/roles/ysera.rb b/roles/ysera.rb
index 45ce22e81..0428b24f8 100644
--- a/roles/ysera.rb
+++ b/roles/ysera.rb
@@ -43,7 +43,6 @@ default_attributes(
     },
     :styles => {
       :default => {
-        :revision => "v5.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
-- 
2.43.2