X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/18a04da809752cf828d58a957e772b878b0200c9..28360d6f39fa7fe8229ed64b4c93d1d0405add47:/roles/toothless.rb diff --git a/roles/toothless.rb b/roles/toothless.rb index b96cea8d7..3c9710b25 100644 --- a/roles/toothless.rb +++ b/roles/toothless.rb @@ -2,9 +2,6 @@ name "toothless" description "Master role applied to toothless" default_attributes( - :hardware => { - :shm_size => "6g" - }, :networking => { :interfaces => { :external_ipv4 => { @@ -24,30 +21,9 @@ default_attributes( :gateway => "fe80::fcff:ffff:feff:ffff" } } - }, - :squid => { - :version => 4, - :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", - "rock /store/squid/rock-16384 22400 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", - "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" } ) run_list( - "role[jump]", - "role[tilecache]" + "role[jump]" )