X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/2d6d56f75a35f748f19411b043b7fc430bdb3c6e..bb01eaa9176f18aacc218e8f706f987afd13595e:/roles/firnen.rb?ds=inline diff --git a/roles/firnen.rb b/roles/firnen.rb index edd924e5d..9d8513f2e 100644 --- a/roles/firnen.rb +++ b/roles/firnen.rb @@ -2,37 +2,21 @@ name "firnen" description "Master role applied to firnen" default_attributes( - :hardware => { - :shm_size => "36g" - }, :networking => { :interfaces => { - :external_ipv4 => { + :external => { :interface => "enp6s0", :role => :external, - :family => :inet, - :address => "188.241.28.82", - :prefix => "29", - :gateway => "188.241.28.81" + :inet => { + :address => "188.241.28.82", + :prefix => "29", + :gateway => "188.241.28.81" + } } } - }, - :squid => { - :version => 4, - :cache_mem => "32768 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" - ] - }, - :tilecache => { - :tile_parent => "katowice.render.openstreetmap.org" } ) run_list( - "role[epix]", - "role[tilecache]" + "role[epix]" )