X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/4823cac779fd084d5776b10ef7b0589dec021526..2d6d56f75a35f748f19411b043b7fc430bdb3c6e:/roles/toothless.rb diff --git a/roles/toothless.rb b/roles/toothless.rb index 908807bbe..b96cea8d7 100644 --- a/roles/toothless.rb +++ b/roles/toothless.rb @@ -27,7 +27,7 @@ default_attributes( }, :squid => { :version => 4, - :cache_mem => "3584 MB", + :cache_mem => "4096 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,21 +35,19 @@ 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 => "16384M" + } + } + }, :tilecache => { - :tile_parent => "london.render.openstreetmap.org", - :tile_siblings => [ - "saphira.openstreetmap.org", - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "london.render.openstreetmap.org" } ) run_list( "role[jump]", - "role[geodns]", "role[tilecache]" )