From: Tom Hughes <tom@compton.nu>
Date: Sun, 22 Jul 2018 18:12:03 +0000 (+0100)
Subject: Use postgis 2.4 on rhaegal
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/fc644b32403b63672bd1de6b9676efec559e5961?hp=c283991b074eda3184dda15738dcbb994ff145a2

Use postgis 2.4 on rhaegal
---

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9128b4e2b..fe3b6c862 100644
--- a/cookbooks/tile/recipes/default.rb
+++ b/cookbooks/tile/recipes/default.rb
@@ -358,9 +358,10 @@ node[:tile][:styles].each do |name, details|
 end
 
 postgresql_version = node[:tile][:database][:cluster].split("/").first
+postgis_version = node[:tile][:database][:postgis]
 
 package "postgis"
-package "postgresql-#{postgresql_version}-postgis-2.3"
+package "postgresql-#{postgresql_version}-postgis-#{postgis_version}"
 
 postgresql_user "jburgess" do
   cluster node[:tile][:database][:cluster]
diff --git a/roles/orm.rb b/roles/orm.rb
index 75e2e1252..5e4c83135 100644
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -66,7 +66,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main"
+      :cluster => "9.6/main",
+      :postgis => "2.3"
     },
     :node_file => "/store/database/nodes",
     :styles => {
diff --git a/roles/rhaegal.rb b/roles/rhaegal.rb
index 6997afa57..8554cecf3 100644
--- a/roles/rhaegal.rb
+++ b/roles/rhaegal.rb
@@ -58,7 +58,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "10/main"
+      :cluster => "10/main",
+      :postgis => "2.4"
     },
     :node_file => "/store/database/nodes",
     :styles => {
diff --git a/roles/scorch.rb b/roles/scorch.rb
index 5c400300b..60adc7ad7 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -75,7 +75,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main"
+      :cluster => "9.6/main",
+      :postgis => "2.3"
     },
     :node_file => "/store/database/nodes",
     :styles => {
diff --git a/roles/vial.rb b/roles/vial.rb
index 25403df8d..e86d32c7f 100644
--- a/roles/vial.rb
+++ b/roles/vial.rb
@@ -93,7 +93,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main"
+      :cluster => "9.6/main",
+      :postgis => "2.3"
     },
     :node_file => "/store/database/nodes",
     :styles => {
diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 16fb61bb3..f9408a69a 100644
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -109,7 +109,8 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.6/main"
+      :cluster => "9.6/main",
+      :postgis => "2.3"
     },
     :node_file => "/store/database/nodes",
     :styles => {