X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0cb7f764b5c8d66c0aa73841b98647b21c35d190..e16fbe6ab0744f178098d51cbc8976bf7067c2ea:/roles/dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index 51f6efab8..619dc6860 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -10,7 +10,7 @@ default_attributes(
         :family => :inet,
         :address => "10.0.48.9",
         :bond => {
-          :slaves => %w[p18p1 p18p2]
+          :slaves => %w[ens18f0 ens18f1]
         }
       },
       :external_ipv4 => {
@@ -28,25 +28,25 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.6"],
+    :versions => ["13"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
-        :fsync => "on",
-        :effective_io_concurrency => "3"
+        :fsync => "off",
+        :effective_io_concurrency => "500"
       }
     }
   },
   :nominatim => {
-    :state => "standalone",
+    :state => "off",
     :enable_backup => false,
     :enable_git_updates => true,
     :dbadmins => %w[lonvia tomh],
-    :dbcluster => "9.6/main",
-    :postgis => "2.3",
+    :dbcluster => "13/main",
+    :postgis => "3",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
     :tablespaces => {
@@ -61,15 +61,6 @@ default_attributes(
       "daux" => "/ssd/tablespaces/daux",
       "iaux" => "/ssd/tablespaces/iaux"
     }
-  },
-  :sysfs => {
-    :md_tune => {
-      :comment => "Enable request merging for NVMe devices",
-      :parameters => {
-        "block/nvme0n1/queue/nomerges" => "1",
-        "block/nvme1n1/queue/nomerges" => "1"
-      }
-    }
   }
 )