X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/dbf7c55e6db5cfa92c0702bada70d4d9757fa39a..b3ee7b1035952ca54061e6cc5c058805101b4cce:/roles/dulcy.rb

diff --git a/roles/dulcy.rb b/roles/dulcy.rb
index ef153a918..adf37e26e 100644
--- a/roles/dulcy.rb
+++ b/roles/dulcy.rb
@@ -1,6 +1,5 @@
 name "dulcy"
-description "Master role applied to dulcy
-"
+description "Master role applied to dulcy"
 
 default_attributes(
   :networking => {
@@ -28,36 +27,45 @@ default_attributes(
     }
   },
   :postgresql => {
-    :versions => ["9.4"],
+    :versions => ["9.6"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
-        :fsync => "on"
+        :fsync => "on",
+        :effective_io_concurrency => "3"
       }
     }
   },
   :nominatim => {
-    :enabled => false,
+    :state => "standalone",
+    :enable_backup => false,
+    :enable_git_updates => true,
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "9.6/main",
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :logdir => "/ssd/nominatim/log",
-    :database => {
-      :cluster => "9.4/main",
-      :dbname => "nominatim",
-      :postgis => "2.1"
-    },
-    :fpm_pools => {
-      :www => {
-        :port => "8000",
-        :pm => "dynamic",
-        :max_children => "60"
-      },
-      :bulk => {
-        :port => "8001",
-        :pm => "static",
-        :max_children => "10"
+    :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"
+    }
+  },
+  :sysfs => {
+    :md_tune => {
+      :comment => "Enable request merging for NVMe devices",
+      :parameters => {
+        "block/nvme0n1/queue/nomerges" => "1",
+        "block/nvme1n1/queue/nomerges" => "1"
       }
     }
   }
@@ -65,5 +73,5 @@ default_attributes(
 
 run_list(
   "role[ic]",
-  "role[nominatim-standalone]"
+  "role[nominatim]"
 )