Make sure tile cookbook only requests the required postgres version

[chef.git] / roles / nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 9564e11831d4a3e7ed6689ff490e00c1ae9afb3a..504fd6f0d9e00b64dc216786e680357a09ed0ebd 100644 (file)
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -14,23 +14,22 @@ default_attributes(
   },
   :apache => {
     :mpm => "event",
-    :timeout => 60,
+    :timeout => 30,
     :keepalive => false,
     :reqtimeout => true,
     :event => {
-      :server_limit => 32,
-      :max_request_workers => 1600,
+      :server_limit => 60,
+      :max_request_workers => 2400,
       :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:7/sec:15"
+      :http_rate_limit => "s:2/sec:15"
     }
   },
   :postgresql => {