X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/246dbd618c071f1bbb33c506e7c4a797fb9d20a8..fa63c845987967418edaff22b75958916b19f19a:/roles/gorynych.rb diff --git a/roles/gorynych.rb b/roles/gorynych.rb index c57c56e0f..704f9940f 100644 --- a/roles/gorynych.rb +++ b/roles/gorynych.rb @@ -5,8 +5,7 @@ default_attributes( :hardware => { :ipmi => { :excluded_sensors => [3, 4] - }, - :shm_size => "20g" + } }, :munin => { :plugins => { @@ -46,31 +45,9 @@ default_attributes( "block/md0/md/sync_speed_max" => "100000" } } - }, - :squid => { - :version => 4, - :cache_mem => "16384 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" - ] - }, - :nginx => { - :cache => { - :proxy => { - :directory => "/store/nginx-cache/proxy-cache", - :max_size => "32768M" - } - } - }, - :tilecache => { - :tile_parent => "moscow.render.openstreetmap.org" } ) run_list( - "role[yandex]", - "role[tilecache]" + "role[yandex]" )