X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a7f8529fd91f04909fd7c9fde1ea843bfbbbf09c..28360d6f39fa7fe8229ed64b4c93d1d0405add47:/roles/nepomuk.rb diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb index 8683ecbe5..12277629d 100644 --- a/roles/nepomuk.rb +++ b/roles/nepomuk.rb @@ -2,6 +2,9 @@ name "nepomuk" description "Master role applied to nepomuk" default_attributes( + :hardware => { + :shm_size => "14g" + }, :networking => { :firewall => { :inet => [ @@ -46,8 +49,14 @@ default_attributes( } }, :squid => { - :cache_mem => "7500 MB", - :cache_dir => "coss /store/squid/coss-01 128000 block-size=8192 max-size=262144 membufs=80" + :version => 4, + :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", + "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" + ] }, :sysfs => { :hdd_tune => { @@ -58,14 +67,7 @@ default_attributes( } }, :tilecache => { - :tile_parent => "lyon.render.openstreetmap.org", - :tile_siblings => [ - "trogdor.openstreetmap.org", - "katie.openstreetmap.org", - "konqi.openstreetmap.org", - "ridgeback.openstreetmap.org", - "gorynych.openstreetmap.org" - ] + :tile_parent => "france.render.openstreetmap.org" } )