X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e51046aae2217f70b2e628159f832e993c6afcf7..341683a1e61fd9f3a9436167fbf039418264d493:/roles/tile.rb diff --git a/roles/tile.rb b/roles/tile.rb index 82dcc21ba..d0de61bbe 100644 --- a/roles/tile.rb +++ b/roles/tile.rb @@ -4,8 +4,9 @@ description "Role applied to all tile servers" default_attributes( :accounts => { :users => { + :pnorman => { :status => :user }, :tile => { - :members => [:jburgess, :tomh] + :members => [:jburgess, :tomh, :pnorman] } } }, @@ -13,7 +14,7 @@ default_attributes( :mpm => "event", :timeout => 60, :event => { - :server_limit => 60, + :server_limit => 80, :max_request_workers => 1200, :threads_per_child => 20, :min_spare_threads => 300, @@ -62,11 +63,16 @@ default_attributes( "net.core.somaxconn" => 10000 } }, - :kernel_scheduler_tune => { - :comment => "Tune kernel scheduler preempt", + :network_conntrack_time_wait => { + :comment => "Only track completed connections for 30 seconds", :parameters => { - "kernel.sched_min_granularity_ns" => 10000000, - "kernel.sched_wakeup_granularity_ns" => 15000000 + "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" => "524288" } }, :no_tcp_slow_start => { @@ -81,7 +87,7 @@ default_attributes( "net.core.default_qdisc" => "fq", "net.ipv4.tcp_congestion_control" => "bbr" } - }, + } }, :tile => { :database => { @@ -99,7 +105,8 @@ default_attributes( :styles => { :default => { :repository => "https://github.com/gravitystorm/openstreetmap-carto.git", - :revision => "v5.3.1", + :revision => "v5.6.1", + :fonts_script => "/srv/tile.openstreetmap.org/styles/default/scripts/get-fonts.sh", :max_zoom => 19 } }