Specify mapnik version for CartoCSS

[chef.git] / roles / dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 98c938615378e8289ef4560400b2e7ef355b94d3..7fb9edefcf5ee501ca7ba641d9449ad3796fa041 100644 (file)
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -10,6 +10,9 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {

+          :mode => "802.3ad",
+          :lacprate => "fast",
+          :xmithashpolicy => "layer3+4",

           :slaves => %w[ens18f0 ens18f1]
         }
       },
           :slaves => %w[ens18f0 ens18f1]
         }
       },


@@ -28,13 +31,10 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["13"],
+    :versions => ["14"],

     :settings => {
       :defaults => {
     :settings => {
       :defaults => {

-        :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
+        :work_mem => "240MB",

         :fsync => "on",
         :effective_io_concurrency => "500"
       }
         :fsync => "on",
         :effective_io_concurrency => "500"
       }


@@ -42,29 +42,14 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
   },
   :nominatim => {
     :state => "standalone",

-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "13/main",
+    :dbcluster => "14/main",

     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",

-    :logdir => "/ssd/nominatim/log",
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
-    }
+    :logdir => "/ssd/nominatim/log"

   }
 )
 
 run_list(
   }
 )
 
 run_list(

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

   "role[nominatim]"
 )
   "role[nominatim]"
 )