X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/75f3a85fe362b3d1163bf1265d0bec291a692c76..81620ad4e472b3e9b3af06f22646ecc0cadeefe7:/roles/nepomuk.rb diff --git a/roles/nepomuk.rb b/roles/nepomuk.rb index 12277629d..4035409b2 100644 --- a/roles/nepomuk.rb +++ b/roles/nepomuk.rb @@ -2,9 +2,6 @@ name "nepomuk" description "Master role applied to nepomuk" default_attributes( - :hardware => { - :shm_size => "14g" - }, :networking => { :firewall => { :inet => [ @@ -48,16 +45,6 @@ default_attributes( } } }, - :squid => { - :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 => { :comment => "Tune the queue for improved performance", @@ -65,13 +52,9 @@ default_attributes( "block/vda/queue/nr_requests" => "128" } } - }, - :tilecache => { - :tile_parent => "france.render.openstreetmap.org" } ) run_list( - "role[lyonix]", - "role[tilecache]" + "role[lyonix]" )