X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/833c23d85fa078d13a800b80df05f472b387777b..5f7a83de0937e7e0f11f028400aa86b8511a49e6:/roles/saphira.rb diff --git a/roles/saphira.rb b/roles/saphira.rb index ebfbc3126..1c4b9a1b7 100644 --- a/roles/saphira.rb +++ b/roles/saphira.rb @@ -3,7 +3,7 @@ description "Master role applied to saphira" default_attributes( :hardware => { - :shm_size => "9g" + :shm_size => "10g" }, :networking => { :interfaces => { @@ -27,7 +27,7 @@ default_attributes( }, :squid => { :version => 4, - :cache_mem => "6144 MB", + :cache_mem => "8192 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", @@ -35,16 +35,15 @@ default_attributes( "rock /store/squid/rock-32768 22800 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" ] }, + :nginx => { + :cache => { + :proxy => { + :max_size => "4096M" + } + } + }, :tilecache => { - :tile_parent => "london.render.openstreetmap.org", - :tile_siblings => [ - "toothless.openstreetmap.org", - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "london.render.openstreetmap.org" } )