X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e9d337c2a49d120a8dcb508879d74f6bab5b84d9..5e5cb7ccbcfcd4e3696ddcd0a3e5218c254e429d:/roles/nominatim.rb

diff --git a/roles/nominatim.rb b/roles/nominatim.rb
index 5ab242997..c6771b851 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,29 @@ 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 => {
-      :server_limit => 32,
-      :max_clients => 1600,
-      :threads_per_child => 50
+      :server_limit => 46,
+      :max_request_workers => 2400,
+      :threads_per_child => 50,
+      :min_spare_threads => 125,
+      :max_spare_threads => 925
+    }
+  },
+  :apt => {
+    :sources => ["postgresql"]
+  },
+  :networking => {
+    :firewall => {
+      :http_rate_limit => "s:2/sec:15"
     }
   },
   :postgresql => {
@@ -27,9 +38,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 +49,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
       }
@@ -54,26 +66,22 @@ default_attributes(
       :parameters => {
         "vm.swappiness" => 10
       }
-    }
-  },
-  :nominatim => {
-    :enabled => true,
-    :repository => "git://git.openstreetmap.org/nominatim.git",
-    :tablespaces => {
-        "Osm2pgsql_Data" => "aux",
-        "Osm2pgsql_Index" => "data",
-        "Place_Data" => "ssd2",
-        "Place_Index" => "ssd1",
-        "Address_Data" => "ssd2",
-        "Address_Index" => "ssd1",
-        "Search_Data" => "ssd1",
-        "Search_Index" => "ssd1",
-        "Aux_Data" => "aux",
-        "Aux_Index" => "aux",
+    },
+    :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]"
 )