X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/237631e34f8bf03cef94d0a1571657b0061cf0bc..0aa2526f9a91d82d40edb7d001a764682cc3c979:/roles/pummelzacken.rb diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index 9fc103d9e..97f2af508 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -5,35 +5,45 @@ default_attributes( :networking => { :interfaces => { :internal_ipv4 => { - :interface => "em1", + :interface => "em1.2801", :role => :internal, :family => :inet, :address => "10.0.0.20" }, :external_ipv4 => { - :interface => "em2", + :interface => "em1.2800", :role => :external, :family => :inet, - :address => "128.40.45.204" + :address => "193.60.236.18" } } }, :postgresql => { - :versions => ["9.5"], + :versions => ["12"], :settings => { :defaults => { :listen_addresses => "10.0.0.20", :work_mem => "160MB", :maintenance_work_mem => "10GB", :random_page_cost => "1.5", - :effective_cache_size => "60GB" + :effective_cache_size => "60GB", + :effective_io_concurrency => "256", + :fsync => "on" } } }, + :apache => { + :event => { + :max_request_workers => 3000, + :threads_per_child => 70 + } + }, :nominatim => { :state => "standalone", - :dbadmins => %w(lonvia tomh), - :dbcluster => "9.5/main", + :dbadmins => %w[lonvia tomh], + :dbcluster => "12/main", + :postgis => "2.5", + :enable_backup => true, :flatnode_file => "/ssd/nominatim/nodes.store", :tablespaces => { "dosm" => "/ssd/tablespaces/dosm", @@ -46,12 +56,11 @@ default_attributes( "isearch" => "/ssd/tablespaces/isearch", "daux" => "/data/tablespaces/daux", "iaux" => "/data/tablespaces/iaux" - }, - :revision => "cmake-port" + } } ) run_list( - "role[ucl-wolfson]", - "role[nominatim-base]" + "role[ucl]", + "role[nominatim]" )