X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f9e4be2de40fb27751305a8315b29901f9ae8886..fb17a8de13320c7d74ba92104288a7a96faab818:/roles/fafnir.rb?ds=inline diff --git a/roles/fafnir.rb b/roles/fafnir.rb index 6b32ec4d9..c526226a8 100644 --- a/roles/fafnir.rb +++ b/roles/fafnir.rb @@ -2,6 +2,9 @@ name "fafnir" description "Master role applied to fafnir" default_attributes( + :hardware => { + :shm_size => "36g" + }, :networking => { :interfaces => { :external_ipv4 => { @@ -23,17 +26,17 @@ default_attributes( } }, :squid => { - :cache_mem => "28000 MB", - :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80" + :version => 4, + :cache_mem => "32768 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", + "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" + ] }, :tilecache => { - :tile_parent => "umea.render.openstreetmap.org", - :tile_siblings => [ - "nidhogg.openstreetmap.org", - "ridgeback.openstreetmap.org", - "rimfaxe.openstreetmap.org", - "trogdor.openstreetmap.org" - ] + :tile_parent => "sweden.render.openstreetmap.org" } )