imagery: fix vdl_light6_deflate source filename

[chef.git] / roles / scorch.rb

diff --git a/roles/scorch.rb b/roles/scorch.rb
index 0cbd708ae810e44e146b56c6087c09d872e35f76..8378856ee17a1ee3a8e81638f78d1fbd1624f871 100644 (file)
--- a/roles/scorch.rb
+++ b/roles/scorch.rb
@@ -2,9 +2,6 @@ name "scorch"
 description "Master role applied to scorch"
 
 default_attributes(
 description "Master role applied to scorch"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",
   :devices => {
     :ssd_system => {
       :comment => "Tune scheduler for system disk",


@@ -44,7 +41,6 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["9.6"],

     :settings => {
       :defaults => {
         :shared_buffers => "8GB",
     :settings => {
       :defaults => {
         :shared_buffers => "8GB",


@@ -64,12 +60,12 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "9.6/main",
-      :postgis => "2.3"
+      :cluster => "12/main",
+      :postgis => "3"

     },
     },

-    :node_file => "/store/database/nodes",

     :styles => {
       :default => {
     :styles => {
       :default => {

+        :revision => "v5.0.0",

         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]
         :tile_directories => [
           { :name => "/store/tiles/default", :min_zoom => 0, :max_zoom => 19 }
         ]