Use postgres 9.4 on yevaud

diff --git a/roles/orm.rb b/roles/orm.rb
index a44ffd143ee65cbb68d7d89cdc70d039af3368fd..7b088c928a527c0c4e25edb8246eb9f821b64b6a 100644 (file)
--- a/roles/orm.rb
+++ b/roles/orm.rb
@@ -65,6 +65,9 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :cluster => "9.1/main"
+    },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {

diff --git a/roles/tile.rb b/roles/tile.rb
index 907b1ae8810386b65a2d2abe206ae8a5f3192e60..e9344cc6843e47c3eeca03323665b026a0db869b 100644 (file)
--- a/roles/tile.rb
+++ b/roles/tile.rb
@@ -51,9 +51,6 @@ default_attributes(
     }
   },
   :tile => {
-    :database => {
-      :cluster => "9.1/main"
-    },
     :data => {
       :world_boundaries => {
         :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz"

diff --git a/roles/yevaud.rb b/roles/yevaud.rb
index 6d33455e4049bec525730c825b3c44e3674fc806..fd8457ec57225f04a5bcfb0a3ffda3a020754325 100644 (file)
--- a/roles/yevaud.rb
+++ b/roles/yevaud.rb
@@ -72,7 +72,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.1"],
+    :versions => ["9.4"],
     :settings => {
       :defaults => {
         :shared_buffers => "3GB",
@@ -98,6 +98,9 @@ default_attributes(
     }
   },
   :tile => {
+    :database => {
+      :cluster => "9.4/main"
+    },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {