X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/1ccc96a0ee45559eacdc6a2e8629c601c00cb33c..85d48bf65d8fbd263e36b8a5ff49e279a3ccafab:/roles/pummelzacken.rb diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb index cdc7e38fd..c6e7d9f58 100644 --- a/roles/pummelzacken.rb +++ b/roles/pummelzacken.rb @@ -19,54 +19,50 @@ default_attributes( } }, :postgresql => { - :versions => [ "9.3" ], :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", - :fsync => "on" + :effective_cache_size => "60GB" } } }, :nominatim => { - :enabled => true, :flatnode_file => "/ssd/nominatim/nodes.store", :database => { - :cluster => "9.3/main", - :dbname => "nominatim", - :postgis => "2.1" + :cluster => "9.3/main", + :dbname => "nominatim", + :postgis => "2.1" }, :fpm_pools => { - :www => { - :port => "8000", - :pm => "dynamic", - :max_children => "70" - }, - :bulk => { - :port => "8001", - :pm => "static", - :max_children => "10" - } + :www => { + :port => "8000", + :pm => "dynamic", + :max_children => "60" + }, + :bulk => { + :port => "8001", + :pm => "static", + :max_children => "10" + } }, - :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", + :redirects => { + :reverse => "poldi.openstreetmap.org" + } + }, + :hardware => { + :grub => { + # lock kernel to 3.16.0-46 due to some issue with igb driver + # see https://github.com/openstreetmap/operations/issues/45 + # for more information. + :kernel => "3.16.0-46" } } ) run_list( "role[ucl-wolfson]", - "role[nominatim]" + "role[nominatim-master]" )