Bump test-kitchen from 2.10.0 to 2.11.0

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 74cc74ba7acff24c7fc0c81c421fa8e9a5a7e480..cb68665420458e7b18f36ca06547f75d55b84268 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -14,21 +14,22 @@ 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,
-      :threads_per_child => 50
+      :server_limit => 100,
+      :max_request_workers => 2400,
+      :threads_per_child => 50,
+      :min_spare_threads => 125,
+      :max_spare_threads => 925,
+      :async_request_worker_factor => 4,
+      :listen_cores_buckets_ratio => 6

     }
   },
     }
   },

-  :apt => {
-    :sources => ["postgresql"]
-  },

   :networking => {
     :firewall => {
   :networking => {
     :firewall => {

-      :http_rate_limit => "s:7/sec:15"
+      :http_rate_limit => "s:2/sec:15"

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


@@ -74,7 +75,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"

       }
     }
   }
       }
     }
   }