X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/df0f163ca9f0c3e692c7adc639982128994f24f5..9c48ae6b9154acb9aeb57cb94fb2fae5a88b9c8d:/roles/nominatim.rb?ds=sidebyside

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 6785c0023..fd8295429 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,25 +1,19 @@
 name "nominatim"
-description "Role applied to all nominatim servers"
+description "Role applied to all nominatim servers."
 
 default_attributes(
   :accounts => {
     :users => {
       :lonvia => { :status => :administrator },
-      :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
-        :members => [:lonvia, :tomh, :twain]
+        :members => [:lonvia, :tomh]
       }
     }
   },
-  :apache => {
-    :mpm => "event",
-    :timeout => 60,
-    :keepalive => false,
-    :event => {
-      :server_limit => 32,
-      :max_clients => 1600,
-      :threads_per_child => 50
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"
     }
   },
   :postgresql => {
@@ -30,8 +24,13 @@ default_attributes(
         :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
+        :jit => "off",
         :shared_buffers => "2GB",
-        :autovacuum_max_workers => "1"
+        :autovacuum_max_workers => "1",
+        :max_parallel_workers_per_gather => "0",
+        :maintenance_work_mem => "10GB",
+        :random_page_cost => "1.5",
+        :effective_cache_size => "60GB"
       }
     }
   },
@@ -43,13 +42,6 @@ default_attributes(
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
     },
-    :kernel_scheduler_tune => {
-      :comment => "Tune kernel scheduler preempt",
-      :parameters => {
-        "kernel.sched_min_granularity_ns" => 10000000,
-        "kernel.sched_wakeup_granularity_ns" => 15000000
-      }
-    },
     :swappiness => {
       :comment => "Reduce swap usage",
       :parameters => {
@@ -65,25 +57,27 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
-        "net.netfilter.nf_conntrack_max" => "131072"
+        "net.netfilter.nf_conntrack_max" => "196608"
       }
     }
   },
   :nominatim => {
-    :enabled => false,
-    :repository => "git://git.openstreetmap.org/nominatim.git",
+    :dbadmins => %w[lonvia tomh],
     :tablespaces => {
-      "Osm2pgsql_Data" => "data",
-      "Osm2pgsql_Index" => "data",
-      "Place_Data" => "data",
-      "Place_Index" => "ssd2",
-      "Address_Data" => "data",
-      "Address_Index" => "ssd2",
-      "Search_Data" => "ssd1",
-      "Search_Index" => "ssd1",
-      "Aux_Data" => "aux",
-      "Aux_Index" => "aux"
-    },
-    :redirects => {}
+      "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"
+    }
   }
 )
+
+run_list(
+  "recipe[nominatim::default]"
+)