X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..933e6016a75e6ce7ca2cc128a01afdcf1506e42f:/roles/poldi.rb?ds=sidebyside diff --git a/roles/poldi.rb b/roles/poldi.rb index 0f5b6c8b1..379e35f20 100644 --- a/roles/poldi.rb +++ b/roles/poldi.rb @@ -40,66 +40,25 @@ 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" - } - } - }, - :postgresql => { - :versions => ["9.3"], - :settings => { - :defaults => { - :shared_buffers => "10GB", - :work_mem => "160MB", - :maintenance_work_mem => "10GB", - :random_page_cost => "1.5", - :effective_cache_size => "48GB", - :fsync => "on" - } - } - }, - :nominatim => { - :enabled => false, - :flatnode_file => "/ssd-old/nominatim/nodes.store", - :database => { - :cluster => "9.3/main", - :dbname => "nominatim", - :postgis => "2.1" - }, - :fpm_pools => { - :www => { - :port => "8000", - :pm => "dynamic", - :max_children => "60" + :address => "193.63.75.101" }, - :bulk => { - :port => "8001", - :pm => "static", - :max_children => "10" + :external_ipv6 => { + :interface => "eth1", + :role => :external, + :family => :inet6, + :address => "2001:630:12:500:2e0:81ff:fec5:333e" } - }, - :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[tyan-s7010]", - "role[nominatim]" + "role[ic]", + "role[tyan-s7010]" )