X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/43b1dc052637e2bf65ef0db17a78c9ded4054d13..5fbc96e38dd8dfcb3eb1ed0a5f4319ccaf244d6d:/roles/longma.rb diff --git a/roles/longma.rb b/roles/longma.rb index f8ff9cd87..e4b3ebc55 100644 --- a/roles/longma.rb +++ b/roles/longma.rb @@ -4,55 +4,47 @@ description "Master role applied to longma" default_attributes( :networking => { :interfaces => { - :internal_ipv4 => { + :internal => { :interface => "bond0", :role => :internal, - :family => :inet, - :address => "10.0.64.13", + :inet => { + :address => "10.0.64.13" + }, :bond => { :mode => "802.3ad", :lacprate => "fast", :xmithashpolicy => "layer3+4", - :slaves => %w[enp68s0f0 enp68s0f1 enp68s0f2 enp68s0f3] + :slaves => %w[enp68s0f0np0 enp68s0f1np1 enp68s0f2np2 enp68s0f3np3] } }, - :external_ipv4 => { + :external => { :interface => "bond0.101", :role => :external, - :family => :inet, - :address => "184.104.226.109" - }, - :external_ipv6 => { - :interface => "bond0.101", - :role => :external, - :family => :inet6, - :address => "2001:470:1:b3b::d" + :inet => { + :address => "184.104.226.109" + }, + :inet6 => { + :address => "2001:470:1:b3b::d" + } } } }, :postgresql => { - :versions => ["14"], + :versions => ["17"], :settings => { :defaults => { :max_connections => "550", :work_mem => "240MB", - :fsync => "on", :effective_io_concurrency => "500" } } }, :nominatim => { - :state => "standalone", - :dbcluster => "14/main", - :postgis => "3", + :dbcluster => "17/main", :enable_qa_tiles => true, - :flatnode_file => "/ssd/nominatim/nodes.store", - :logdir => "/ssd/nominatim/log", - :fpm_pools => { - "nominatim.openstreetmap.org" => { - :max_children => 200 - } - } + :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store", + :api_workers => 24, + :api_pool_size => 10 } )