X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/fd5b662ae1ccede11c2f5eb67253f8cd3ae8a507..0e95d80e29d91ead2a078ee13682268c28e2ffc6:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index d640ec5f0..9564e1183 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,31 +8,40 @@ default_attributes(
       :twain => { :status => :administrator },
       :nominatim => {
         :status => :role,
-        :members => [ :lonvia, :tomh, :twain ]
-      },
+        :members => [:lonvia, :tomh, :twain]
+      }
     }
   },
   :apache => {
     :mpm => "event",
     :timeout => 60,
     :keepalive => false,
+    :reqtimeout => true,
     :event => {
-      :max_clients => 560,
-      :threads_per_child => 35
+      :server_limit => 32,
+      :max_request_workers => 1600,
+      :threads_per_child => 50,
+      :min_spare_threads => 125,
+      :max_spare_threads => 925
     }
   },
   :apt => {
-    :sources => [ "ubuntugis-stable", "ubuntugis-unstable" ]
+    :sources => ["postgresql"]
+  },
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:7/sec:15"
+    }
   },
   :postgresql => {
-    :versions => [ "9.1" ],
     :settings => {
       :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"
       }
     }
@@ -40,31 +49,39 @@ default_attributes(
   :sysctl => {
     :postgres => {
       :comment => "Increase shared memory for postgres",
-      :parameters => { 
-        "kernel.shmmax" => 16 * 1024 * 1024 * 1024,
-        "kernel.shmall" => 16 * 1024 * 1024 * 1024 / 4096
+      :parameters => {
+        "kernel.shmmax" => 26 * 1024 * 1024 * 1024,
+        "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096
+      }
+    },
+    :kernel_scheduler_tune => {
+      :comment => "Tune kernel scheduler preempt",
+      :parameters => {
+        "kernel.sched_min_granularity_ns" => 10000000,
+        "kernel.sched_wakeup_granularity_ns" => 15000000
+      }
+    },
+    :swappiness => {
+      :comment => "Reduce swap usage",
+      :parameters => {
+        "vm.swappiness" => 10
       }
-    }
-  },
-  :nominatim => {
-    :repository => "git://git.openstreetmap.org/nominatim.git",
-    :database => {
-        :cluster => "9.1/main",
-        :dbname => "nominatim"
     },
-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "25"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "7"
-        }
+    :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" => "131072"
+      }
     }
   }
 )
 
 run_list(
-  "recipe[nominatim]"
+  "recipe[nominatim::default]"
 )