X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/0199f3853369b47e62424ed434665d9f768b2d38..c410bf74e84ca08033e1e8820a2e21a8de5b91c5:/roles/nominatim.rb diff --git a/roles/nominatim.rb b/roles/nominatim.rb index a5f30c4a3..7665045a5 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,8 @@ default_attributes( :checkpoint_segments => "32", :checkpoint_timeout => "10min", :checkpoint_completion_target => "0.9", + :jit => "off", + :shared_buffers => "2GB", :autovacuum_max_workers => "1" } } @@ -64,24 +76,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 => true, - :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" - } } ) + +run_list( + "recipe[nominatim::default]" +)