X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/74ccc507f7e26531cee96cc31115a4f50a4fed72..8b26972a6378577bb1f565093453bce77752a8eb:/roles/jakelong.rb?ds=sidebyside diff --git a/roles/jakelong.rb b/roles/jakelong.rb index 94200c338..945bdd52f 100644 --- a/roles/jakelong.rb +++ b/roles/jakelong.rb @@ -2,6 +2,9 @@ name "jakelong" description "Master role applied to jakelong" default_attributes( + :hardware => { + :shm_size => "3g" + }, :networking => { :interfaces => { :external_ipv4 => { @@ -23,8 +26,22 @@ default_attributes( } }, :squid => { + :version => 4, :cache_mem => "1024 MB", - :cache_dir => "coss /store/squid/coss-01 24000 block-size=8192 max-size=262144 membufs=30" + :cache_dir => [ + "rock /store/squid/rock-4096 3840 swap-timeout=200 slot-size=4096 max-size=3996", + "rock /store/squid/rock-8192 4800 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", + "rock /store/squid/rock-16384 6720 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", + "rock /store/squid/rock-32768 8640 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" + ] + }, + :nginx => { + :cache => { + :proxy => { + :keys_zone => "proxy_cache_zone:64M", + :max_size => "2048M" + } + } }, :sysctl => { :kvm => { @@ -42,19 +59,11 @@ default_attributes( } }, :tilecache => { - :tile_parent => "sanfrancisco.render.openstreetmap.org", - :tile_siblings => [ - "stormfly-02.openstreetmap.org", - "ascalon.openstreetmap.org", - "nepomuk.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org" - ] + :tile_parent => "sanfrancisco.render.openstreetmap.org" } ) run_list( "role[prgmr]", - "role[geodns]", "role[tilecache]" )