X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/244972c26977b8a74afc4f9e4628501355c4065f..c1d216479f8ffd373f29c77e1e3c23c2bac168fe:/roles/tile.rb diff --git a/roles/tile.rb b/roles/tile.rb index 5bfd032dd..4bc8717cd 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -6,9 +6,9 @@ default_attributes( :users => { :tile => { :status => :role, - :members => [ :jburgess, :tomh ] - }, - }, + :members => [:jburgess, :tomh] + } + } }, :apache => { :mpm => "event", @@ -22,11 +22,7 @@ default_attributes( :max_requests_per_child => 100000 } }, - :apt => { - :sources => [ "ubuntugis-stable" ] - }, :postgresql => { - :versions => [ "9.1" ], :settings => { :defaults => { :temp_buffers => "32MB", @@ -44,12 +40,16 @@ default_attributes( :parameters => { "net.core.somaxconn" => 10000 } + }, + :kernel_scheduler_tune => { + :comment => "Tune kernel scheduler preempt", + :parameters => { + "kernel.sched_min_granularity_ns" => 10000000, + "kernel.sched_wakeup_granularity_ns" => 15000000 + } } }, :tile => { - :database => { - :cluster => "9.1/main" - }, :data => { :world_boundaries => { :url => "http://planet.openstreetmap.org/historical-shapefiles/world_boundaries-spherical.tgz" @@ -71,12 +71,20 @@ default_attributes( :land_polygons => { :url => "http://data.openstreetmapdata.com/land-polygons-split-3857.zip", :refresh => true + }, + :antarctica_icesheet_polygons => { + :url => "http://data.openstreetmapdata.com/antarctica-icesheet-polygons-3857.zip", + :refresh => true + }, + :antarctica_icesheet_outlines => { + :url => "http://data.openstreetmapdata.com/antarctica-icesheet-outlines-3857.zip", + :refresh => true } }, :styles => { :default => { :repository => "git://github.com/gravitystorm/openstreetmap-carto.git", - :revision => "v2.5.0", + :revision => "v2.37.1", :max_zoom => 19 } }