Update yevaud to postgresql 9.6 and carto v4.0.0

diff --git a/roles/orm.rb b/roles/orm.rb
index 3c47c55faa4d5b8e83817c07dcc58a799675ce6c..75e2e12525b8f434cc605b1257396d0a67e17da2 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -71,7 +71,6 @@ default_attributes(
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
-        :revision => "v4.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default-low", :min_zoom => 0, :max_zoom => 17 },
           { :name => "/store/tiles/default-high", :min_zoom => 18, :max_zoom => 19 }

diff --git a/roles/scorch.rb b/roles/scorch.rb
index d6823bca05cd51c815d5e872a9c73a8c5d529e45..b22c905f966c5f4d8b0866e553556a4920aff91b 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -75,7 +75,6 @@ default_attributes(
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
-        :revision => "v4.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 586bb25cf965b0d09d5a7b9284488cfd6b3d8a67..4fb78586ea91ee0b2ee7103fc2edd6a8346cb7c1 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -90,7 +90,7 @@ default_attributes(
     :styles => {
       :default => {
         :repository => "git://github.com/gravitystorm/openstreetmap-carto.git",
-        :revision => "v3.3.0",
+        :revision => "v4.0.0",
         :max_zoom => 19
       }
     }

diff --git a/roles/vial.rb b/roles/vial.rb
index 30b995fb5c08da9c8905494364efc4a90373f9c1..1b3aa0ad99d63d8817c6a325c596505d4485f57f 100644 (file)
--- a/roles/vial.rb
+++ b/roles/vial.rb
@@ -64,7 +64,6 @@ default_attributes(
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
-        :revision => "v4.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 2895db2451e31ec24bf33174c46d74c14d13ee86..16fb61bb3134a4087343bb425f49641ed2e84593 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -89,7 +89,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -109,7 +109,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.5/main"
+      :cluster => "9.6/main"
     },
     :node_file => "/store/database/nodes",
     :styles => {