X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/600c4e6130ff3b98df2897badfb5a6fbdcca1df2..79ca9a09538da1729dc8110c323bd3af9a3e1eeb:/roles/chrysophylax.rb diff --git a/roles/chrysophylax.rb b/roles/chrysophylax.rb index f3574f779..0717ab372 100644 --- a/roles/chrysophylax.rb +++ b/roles/chrysophylax.rb @@ -3,7 +3,7 @@ description "Master role applied to chrysophylax" default_attributes( :hardware => { - :shm_size => "14g" + :shm_size => "12g" }, :networking => { :interfaces => { @@ -27,7 +27,7 @@ default_attributes( }, :squid => { :version => 4, - :cache_mem => "12288 MB", + :cache_mem => "10240 MB", :cache_dir => [ "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", @@ -35,13 +35,15 @@ default_attributes( "rock /store/squid/rock-32768 45000 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" ] }, + :nginx => { + :cache => { + :proxy => { + :max_size => "16384M" + } + } + }, :tilecache => { - :tile_parent => "zurich.render.openstreetmap.org", - :tile_siblings => [ - "noomoahk.openstreetmap.org", - "ladon.openstreetmap.org", - "culebre.openstreetmap.org" - ] + :tile_parent => "zurich.render.openstreetmap.org" } )