X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3a4d52bd4c0f8e6ae7679145846b7bc7845d8ace..6d5ddf3137c047a9933d1f0ca3be2db55dab148b:/roles/poldi.rb?ds=sidebyside diff --git a/roles/poldi.rb b/roles/poldi.rb index 127a5265b..7fc730a31 100644 --- a/roles/poldi.rb +++ b/roles/poldi.rb @@ -40,31 +40,35 @@ default_attributes( :interface => "eth0", :role => :internal, :family => :inet, - :address => "10.0.0.16" + :address => "146.179.159.164" }, :external_ipv4 => { :interface => "eth1", :role => :external, :family => :inet, - :address => "128.40.45.203" + :address => "193.63.75.101" + }, + :external_ipv6 => { + :interface => "eth1", + :role => :external, + :family => :inet6, + :address => "2001:630:12:500:2e0:81ff:fec5:333e" } } }, :postgresql => { - :versions => [ "9.3" ], + :versions => ["9.3"], :settings => { :defaults => { - :shared_buffers => "10GB", :work_mem => "160MB", :maintenance_work_mem => "10GB", :random_page_cost => "1.5", - :effective_cache_size => "48GB", + :effective_cache_size => "40GB", :fsync => "on" } } }, :nominatim => { - :enabled => false, :flatnode_file => "/ssd-old/nominatim/nodes.store", :database => { :cluster => "9.3/main", @@ -82,24 +86,12 @@ default_attributes( :pm => "static", :max_children => "10" } - }, - :tablespaces => { - "Osm2pgsql_Data" => "aux", - "Osm2pgsql_Index" => "data", - "Place_Data" => "ssd2", - "Place_Index" => "ssd1", - "Address_Data" => "ssd2", - "Address_Index" => "ssd1", - "Search_Data" => "ssd1", - "Search_Index" => "ssd1", - "Aux_Data" => "aux", - "Aux_Index" => "aux" } } ) run_list( - "role[ucl-wolfson]", + "role[ic]", "role[tyan-s7010]", - "role[nominatim]" + "role[nominatim-standalone]" )