X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2ddf7d9e9f12126de76fd071c5a9f619e4cab1a1..a5db203aa5d5ece82eeee0321fe3a4e677dc679a:/roles/pummelzacken.rb diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index a97333751..d237bd053 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -5,68 +5,61 @@ 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.3"], + :versions => ["12"], :settings => { :defaults => { - :shared_buffers => "10GB", + :listen_addresses => "10.0.0.20", :work_mem => "160MB", :maintenance_work_mem => "10GB", :random_page_cost => "1.5", :effective_cache_size => "60GB", + :effective_io_concurrency => "256", :fsync => "on" } } }, :nominatim => { - :enabled => true, + :state => "standalone", + :dbadmins => %w[lonvia tomh], + :dbcluster => "12/main", + :postgis => "2.5", + :enable_backup => true, :flatnode_file => "/ssd/nominatim/nodes.store", - :database => { - :cluster => "9.3/main", - :dbname => "nominatim", - :postgis => "2.1" + :tablespaces => { + "dosm" => "/ssd/tablespaces/dosm", + "iosm" => "/ssd/tablespaces/iosm", + "dplace" => "/ssd/tablespaces/dplace", + "iplace" => "/ssd/tablespaces/iplace", + "daddress" => "/ssd/tablespaces/daddress", + "iaddress" => "/ssd/tablespaces/iaddress", + "dsearch" => "/ssd/tablespaces/dsearch", + "isearch" => "/ssd/tablespaces/isearch", + "daux" => "/data/tablespaces/daux", + "iaux" => "/data/tablespaces/iaux" }, :fpm_pools => { :www => { - :port => "8000", - :pm => "dynamic", - :max_children => "60" - }, - :bulk => { - :port => "8001", - :pm => "static", - :max_children => "5" + :max_children => "40" } - }, - :tablespaces => { - "Osm2pgsql_Data" => "ssd", - "Osm2pgsql_Index" => "ssd", - "Place_Data" => "ssd", - "Place_Index" => "ssd", - "Address_Data" => "ssd", - "Address_Index" => "ssd", - "Search_Data" => "ssd", - "Search_Index" => "ssd", - "Aux_Data" => "data", - "Aux_Index" => "ssd" } } ) run_list( - "role[ucl-wolfson]", + "role[ucl]", "role[nominatim]" )