X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e47ce8c5fb7b456fcf36a6d6253a71e1da9fa729..5fbc96e38dd8dfcb3eb1ed0a5f4319ccaf244d6d:/roles/nominatim.rb?ds=inline diff --git a/roles/nominatim.rb b/roles/nominatim.rb index f0f2a2dc3..fca0d8ee0 100644 --- a/roles/nominatim.rb +++ b/roles/nominatim.rb @@ -1,25 +1,19 @@ name "nominatim" -description "Role applied to all nominatim servers" +description "Role applied to all nominatim servers." default_attributes( :accounts => { :users => { :lonvia => { :status => :administrator }, - :twain => { :status => :administrator }, :nominatim => { :status => :role, - :members => [ :lonvia, :tomh, :twain ] - }, + :members => [:lonvia, :tomh] + } } }, - :apache => { - :mpm => "event", - :timeout => 60, - :keepalive => false, - :event => { - :server_limit => 32, - :max_clients => 1600, - :threads_per_child => 50 + :networking => { + :firewall => { + :http_rate_limit => "s:2/sec:15" } }, :postgresql => { @@ -27,28 +21,29 @@ default_attributes( :defaults => { :max_connections => "450", :synchronous_commit => "off", - :checkpoint_segments => "50", :checkpoint_timeout => "10min", :checkpoint_completion_target => "0.9", - :autovacuum_max_workers => "1" + :jit => "off", + :shared_buffers => "2GB", + :autovacuum_max_workers => "1", + :max_parallel_workers_per_gather => "0", + :maintenance_work_mem => "10GB", + :seq_page_cost => "3.0", + :random_page_cost => "3.0", + :effective_cache_size => "60GB", + :wal_level => "minimal", + :max_wal_senders => "0" } } }, :sysctl => { :postgres => { :comment => "Increase shared memory for postgres", - :parameters => { + :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 => { @@ -57,23 +52,22 @@ default_attributes( }, :network_conntrack_time_wait => { :comment => "Only track completed connections for 30 seconds", - :parameters => { + :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" + "net.netfilter.nf_conntrack_max" => "196608" } } }, :nominatim => { - :enabled => true, - :repository => "git://git.openstreetmap.org/nominatim.git" + :dbadmins => %w[lonvia tomh] } ) run_list( - "recipe[nominatim]" + "recipe[nominatim::default]" )