From: Tom Hughes <tom@compton.nu>
Date: Fri, 9 Jun 2017 18:21:28 +0000 (+0100)
Subject: Update scorch to postgresql 9.6 and carto v4.0.0
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/5f87ccf2706e05cf500428f588870405a560b636?hp=1dcb7b2148e459d5b96fb3e2124f86308c1077b0

Update scorch to postgresql 9.6 and carto v4.0.0
---

diff --git a/roles/scorch.rb b/roles/scorch.rb
index c8f3b0aa0..d6823bca0 100644
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -50,7 +50,7 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
@@ -70,11 +70,12 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "9.5/main"
+      :cluster => "9.6/main"
     },
     :node_file => "/store/database/nodes",
     :styles => {
       :default => {
+        :revision => "v4.0.0",
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]