Use postgis 2.4 on rhaegal

diff --git a/cookbooks/tile/recipes/default.rb b/cookbooks/tile/recipes/default.rb
index 9128b4e2b8af0c7a725d5495f30e519e55aa7f3e..fe3b6c8622543aa1935dfd7fac75794fd2a16f9e 100644 (file)
--- 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 75e2e12525b8f434cc605b1257396d0a67e17da2..5e4c83135f08de40de146d9938b4af6f02c24f02 100644 (file)
--- 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 6997afa571737f608503e37b1b1faed5c82dd9c5..8554cecf376a40fb4be1a0dd5e72648888cffe64 100644 (file)
--- 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 5c400300b7802ef86fe1ce723a966105179bbb93..60adc7ad7420fa827c2da9c3670c79269dc48e41 100644 (file)
--- 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 25403df8d883ebb1239cebe95b308d273c000655..e86d32c7f3e9d32aafd8cb9e55c6c766de4da8ad 100644 (file)
--- 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 16fb61bb3134a4087343bb425f49641ed2e84593..f9408a69aec38ea10ba6db166df2c16e8a0e487f 100644 (file)
--- 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 => {