X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d7fdbac2c8939e77252fe33f1c3b4aff47b0e2e7..9efaa37d8f7bf4f9a019fc2b6208762b94d4f04c:/roles/nominatim.rb?ds=inline

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index a6d772e43..93d917e7b 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,30 +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
-    }
-  },
-  :chef => {
-    :client => {
-      :version => "12.1.2-1"
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"
     }
   },
   :postgresql => {
@@ -32,10 +21,16 @@ default_attributes(
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
-        :autovacuum_max_workers => "1"
+        :jit => "off",
+        :shared_buffers => "2GB",
+        :autovacuum_max_workers => "1",
+        :max_parallel_workers_per_gather => "0",
+        :maintenance_work_mem => "10GB",
+        :random_page_cost => "1.5",
+        :effective_cache_size => "60GB"
       }
     }
   },
@@ -69,16 +64,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 => true,
-    :repository => "git://git.openstreetmap.org/nominatim.git"
+    :dbadmins => %w[lonvia tomh],
+    :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"
+    }
   }
 )
 
 run_list(
-  "recipe[nominatim]"
+  "recipe[nominatim::default]"
 )