Merge remote-tracking branch 'github/pull/467'

[chef.git] / roles / odin.rb

diff --git a/roles/odin.rb b/roles/odin.rb
index 9b7975aafeb7d22da9decbf4f9981e8b732f5f2f..6a71803393a913a9e344dd2860e66e2ac29cfdaa 100644 (file)
--- a/roles/odin.rb
+++ b/roles/odin.rb
@@ -28,7 +28,6 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["10"],

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


@@ -48,10 +47,10 @@ default_attributes(
   },
   :tile => {
     :database => {
   },
   :tile => {
     :database => {

-      :cluster => "10/main",
-      :postgis => "2.4"
+      :cluster => "12/main",
+      :postgis => "3"

     },
     },

-    :node_file => "/store/database/nodes",
+    :mapnik => "3.1",

     :styles => {
       :default => {
         :tile_directories => [
     :styles => {
       :default => {
         :tile_directories => [


@@ -63,6 +62,6 @@ default_attributes(
 )
 
 run_list(
 )
 
 run_list(

-  "role[equinix]",
+  "role[equinix-ams]",

   "role[tile]"
 )
   "role[tile]"
 )