Expect munin to use an IPv6 socket

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 6e2a75ce4bb337acdbbfb9647ddf0720c8da2497..9bfcc288d2dad4112584498adc1870ee03812d8e 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -14,17 +14,27 @@ default_attributes(
   },
   :apache => {
     :mpm => "event",
-    :timeout => 60,
+    :timeout => 30,
     :keepalive => false,
+    :reqtimeout => true,
     :event => {
-      :server_limit => 32,
-      :max_clients => 1600,
-      :threads_per_child => 50
+      :server_limit => 60,
+      :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 => {
+      :http_rate_limit => "s:2/sec:15"
+    }
+  },
   :postgresql => {
     :settings => {
       :defaults => {