Make sure tile cookbook only requests the required postgres version

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index 1ae0353930c4ceb789c0ef2ab733bc7d864a753b..17c9f548ddf5a7034b648fe44e02921244d7367d 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -2,10 +2,6 @@ name "bowser"
 description "Master role applied to bowser"
 
 default_attributes(
 description "Master role applied to bowser"
 
 default_attributes(

-  :apt => {
-    :sources => ["postgresql"]
-  },
-  :location => "Carlton, Victoria, Australia",

   :networking => {
     :interfaces => {
       :external_ipv4 => {
   :networking => {
     :interfaces => {
       :external_ipv4 => {


@@ -19,14 +15,9 @@ default_attributes(
           :slaves => %w[ens14f0 ens14f1]
         }
       }
           :slaves => %w[ens14f0 ens14f1]
         }
       }

-    },
-    :nameservers => [
-      "202.158.207.1",
-      "202.158.207.2"
-    ]
+    }

   },
   :postgresql => {
   },
   :postgresql => {

-    :versions => ["10"],

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


@@ -46,12 +37,12 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "10/main",
-      :postgis => "2.4"
+      :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 }
         ]