X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/d5c4929d8366de7aeb0dd18cbc051e53dae1420d..50490c2f1235ee4db07c22775f98eb0a3563ef45:/roles/gorynych.rb diff --git a/roles/gorynych.rb b/roles/gorynych.rb index afdb63b44..850929136 100644 --- a/roles/gorynych.rb +++ b/roles/gorynych.rb @@ -3,7 +3,7 @@ description "Master role applied to gorynych" default_attributes( :hardware => { - :shm_size => "18g" + :shm_size => "20g" }, :munin => { :plugins => { @@ -48,18 +48,21 @@ default_attributes( :version => 4, :cache_mem => "16384 MB", :cache_dir => [ - "rock /store/squid/rock-4096 12800 swap-timeout=200 slot-size=4096 max-size=3996", - "rock /store/squid/rock-8192 16000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", - "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" + "rock /store/squid/rock-4096 20000 swap-timeout=200 slot-size=4096 max-size=3996", + "rock /store/squid/rock-8192 25000 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", + "rock /store/squid/rock-16384 35000 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", + "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" ] }, + :nginx => { + :cache => { + :proxy => { + :directory => "/store/nginx-cache/proxy-cache" + } + } + }, :tilecache => { - :tile_parent => "moscow.render.openstreetmap.org", - :tile_siblings => [ - "noomoahk.openstreetmap.org", - "cmok.openstreetmap.org" - ] + :tile_parent => "moscow.render.openstreetmap.org" } )