X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..a5a3b8b5d676e4e7c46f5124325d2ca799bee76f:/roles/nominatim.rb?ds=sidebyside diff --git a/roles/nominatim.rb b/roles/nominatim.rb index dff1acca7..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,7 +8,7 @@ default_attributes( :twain => { :status => :administrator }, :nominatim => { :status => :role, - :members => [ :lonvia, :tomh, :twain ] + :members => [:lonvia, :tomh, :twain] } } }, @@ -16,10 +16,21 @@ default_attributes( :mpm => "event", :timeout => 60, :keepalive => false, + :reqtimeout => true, :event => { :server_limit => 32, - :max_clients => 1600, - :threads_per_child => 50 + :max_request_workers => 1600, + :threads_per_child => 50, + :min_spare_threads => 125, + :max_spare_threads => 925 + } + }, + :apt => { + :sources => ["postgresql"] + }, + :networking => { + :firewall => { + :http_rate_limit => "s:7/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" } } @@ -67,13 +79,9 @@ default_attributes( "net.netfilter.nf_conntrack_max" => "131072" } } - }, - :nominatim => { - :enabled => true, - :repository => "git://git.openstreetmap.org/nominatim.git" } ) run_list( - "recipe[nominatim]" + "recipe[nominatim::default]" )