X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/96ec481d8fc8db85b44daee8d87889d8fce909d4..407fea83cd6c9cffdfdf8fdb685a92c727dcee6e:/roles/nominatim.rb?ds=sidebyside

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index bcfb5434a..8981e500a 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -5,27 +5,17 @@ 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,
-    :reqtimeout => true,
-    :event => {
-      :server_limit => 32,
-      :max_request_workers => 1600,
-      :threads_per_child => 50
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"
     }
   },
-  :apt => {
-    :sources => ["postgresql"]
-  },
   :postgresql => {
     :settings => {
       :defaults => {
@@ -34,8 +24,10 @@ 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"
       }
     }
   },
@@ -69,7 +61,7 @@ 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"
       }
     }
   }