Merge remote-tracking branch 'github/pull/447'

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index ac76db74465acce5e16fac01a89f0afd671c5e6d..7665045a55661141747ce766aee76694aa3ff7a8 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -14,19 +14,23 @@ default_attributes(
   },
   :apache => {
     :mpm => "event",
   },
   :apache => {
     :mpm => "event",

-    :timeout => 60,
+    :timeout => 30,

     :keepalive => false,
     :reqtimeout => true,
     :event => {
     :keepalive => false,
     :reqtimeout => true,
     :event => {

-      :server_limit => 32,
-      :max_request_workers => 1600,
+      :server_limit => 100,
+      :max_request_workers => 2400,

       :threads_per_child => 50,
       :min_spare_threads => 125,
       :threads_per_child => 50,
       :min_spare_threads => 125,

-      :max_spare_threads => 925
+      :max_spare_threads => 925,
+      :async_request_worker_factor => 4,
+      :listen_cores_buckets_ratio => 6

     }
   },
     }
   },

-  :apt => {
-    :sources => ["postgresql"]
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"
+    }

   },
   :postgresql => {
     :settings => {
   },
   :postgresql => {
     :settings => {


@@ -36,6 +40,7 @@ default_attributes(
         :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
         :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",

+        :jit => "off",

         :shared_buffers => "2GB",
         :autovacuum_max_workers => "1"
       }
         :shared_buffers => "2GB",
         :autovacuum_max_workers => "1"
       }


@@ -71,7 +76,7 @@ default_attributes(
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {
     :network_conntrack_max => {
       :comment => "Increase max number of connections tracked",
       :parameters => {

-        "net.netfilter.nf_conntrack_max" => "131072"
+        "net.netfilter.nf_conntrack_max" => "196608"

       }
     }
   }
       }
     }
   }