X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/b8b2a707aaa8b0b726a0bf181766901a4b5b8030..22b6756f4d2fda8b1120c5b86d7dc9dd46f045f5:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 05a65feea..cb6866542 100644
--- a/roles/nominatim.rb
+++ b/roles/nominatim.rb
@@ -1,5 +1,5 @@
 name "nominatim"
-description "Role applied to all nominatim servers"
+description "Role applied to all nominatim servers."
 
 default_attributes(
   :accounts => {
@@ -14,12 +14,22 @@ 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 => 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
+    }
+  },
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"
     }
   },
   :postgresql => {
@@ -30,6 +40,7 @@ default_attributes(
         :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
+        :shared_buffers => "2GB",
         :autovacuum_max_workers => "1"
       }
     }
@@ -64,25 +75,12 @@ 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"
       }
     }
-  },
-  :nominatim => {
-    :enabled => false,
-    :repository => "git://git.openstreetmap.org/nominatim.git",
-    :tablespaces => {
-      "Osm2pgsql_Data" => "data",
-      "Osm2pgsql_Index" => "data",
-      "Place_Data" => "data",
-      "Place_Index" => "ssd2",
-      "Address_Data" => "data",
-      "Address_Index" => "ssd2",
-      "Search_Data" => "ssd1",
-      "Search_Index" => "ssd1",
-      "Aux_Data" => "aux",
-      "Aux_Index" => "aux"
-    },
-    :redirects => {}
   }
 )
+
+run_list(
+  "recipe[nominatim::default]"
+)