X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/2381f5a670ed0387401ebe94dbfbda983cc76011..68c9e352cb7fb2dc67fd8241c75ab6ffc19376e1:/roles/nominatim.rb diff --git a/roles/nominatim.rb b/roles/nominatim.rb index e6afd469f..dff1acca7 100644 --- a/roles/nominatim.rb +++ b/roles/nominatim.rb @@ -9,7 +9,7 @@ default_attributes( :nominatim => { :status => :role, :members => [ :lonvia, :tomh, :twain ] - }, + } } }, :apache => { @@ -37,7 +37,7 @@ default_attributes( :sysctl => { :postgres => { :comment => "Increase shared memory for postgres", - :parameters => { + :parameters => { "kernel.shmmax" => 26 * 1024 * 1024 * 1024, "kernel.shmall" => 26 * 1024 * 1024 * 1024 / 4096 } @@ -57,32 +57,20 @@ default_attributes( }, :network_conntrack_time_wait => { :comment => "Only track completed connections for 30 seconds", - :parameters => { + :parameters => { "net.netfilter.nf_conntrack_tcp_timeout_time_wait" => "30" } }, :network_conntrack_max => { :comment => "Increase max number of connections tracked", :parameters => { - "net.netfilter.nf_conntrack_max" => "131072" + "net.netfilter.nf_conntrack_max" => "131072" } } }, :nominatim => { :enabled => true, - :repository => "git://git.openstreetmap.org/nominatim.git", - :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", - } + :repository => "git://git.openstreetmap.org/nominatim.git" } )