X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8bf90ce3ab5686bb008c17d4cfad58f9ef0511b4..7e52994e42d49a148ab9b1931d79e59f837af8a7:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index e26882dc6..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 => {
@@ -8,18 +8,28 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
-        :members => [ :lonvia, :tomh, :twain ]
-      },
+        :members => [:lonvia, :tomh, :twain]
+      }
     }
   },
   :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 => {
@@ -27,9 +37,10 @@ default_attributes(
       :defaults => {
         :max_connections => "450",
         :synchronous_commit => "off",
-        :checkpoint_segments => "50",
+        :checkpoint_segments => "32",
         :checkpoint_timeout => "10min",
         :checkpoint_completion_target => "0.9",
+        :shared_buffers => "2GB",
         :autovacuum_max_workers => "1"
       }
     }
@@ -37,7 +48,7 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
+      :parameters => {
         "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
         "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
       }
@@ -48,13 +59,28 @@ default_attributes(
         "kernel.sched_min_granularity_ns" => 10000000,
         "kernel.sched_wakeup_granularity_ns" => 15000000
       }
+    },
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
+      }
+    },
+    :network_conntrack_time_wait => {
+      :comment => "Only track completed connections for 30 seconds",
+      :parameters => {
+        "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30"
+      }
+    },
+    :network_conntrack_max => {
+      :comment => "Increase max number of connections tracked",
+      :parameters => {
+        "net.netfilter.nf_conntrack_max" => "196608"
+      }
     }
-  },
-  :nominatim => {
-    :repository => "git://git.openstreetmap.org/nominatim.git"
   }
 )
 
 run_list(
-  "recipe[nominatim]"
+  "recipe[nominatim::default]"
 )