X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/9862a67f1d12b652e2a2bbb12d35640ab3f9e9b5..cd4b2637292586ad150eae45db643f2f7bb1708d:/roles/jakelong.rb?ds=sidebyside diff --git a/roles/jakelong.rb b/roles/jakelong.rb index c5021d468..cd8bcb17b 100644 --- a/roles/jakelong.rb +++ b/roles/jakelong.rb @@ -2,28 +2,69 @@ name "jakelong" description "Master role applied to jakelong" default_attributes( + :hardware => { + :shm_size => "3g" + }, :networking => { :interfaces => { :external_ipv4 => { :interface => "eth0", :role => :external, :family => :inet, - :address => "64.62.205.202", - :prefix => "26", - :gateway => "64.62.205.193" + :address => "71.19.155.177", + :prefix => "24", + :gateway => "71.19.155.1" + }, + :external_ipv6 => { + :interface => "eth0", + :role => :external, + :family => :inet6, + :address => "2605:2700:0:17:a800:ff:fe3e:cdca", + :prefix => "64", + :gateway => "2605:2700:0:17::1" } } }, :squid => { - :cache_mem => "650 MB", - :cache_dir => "coss /store/squid/coss-01 15000 block-size=8192 max-size=262144 membufs=30" + :version => 4, + :cache_mem => "1024 MB", + :cache_dir => [ + "rock /store/squid/rock-4096 3840 swap-timeout=200 slot-size=4096 max-size=3996", + "rock /store/squid/rock-8192 4800 swap-timeout=200 slot-size=8192 min-size=3997 max-size=8092", + "rock /store/squid/rock-16384 6720 swap-timeout=200 slot-size=16384 min-size=8093 max-size=16284", + "rock /store/squid/rock-32768 8640 swap-timeout=200 slot-size=32768 min-size=16285 max-size=262144" + ] + }, + :nginx => { + :cache => { + :proxy => { + :keys_zone => "proxy_cache_zone:64M", + :max_size => "2048M" + } + } + }, + :sysctl => { + :kvm => { + :comment => "Tuning for KVM guest", + :parameters => { + "kernel.sched_min_granularity_ns" => 10000000, + "kernel.sched_wakeup_granularity_ns" => 15000000 + } + }, + :network_conntrack_max => { + :comment => "Increase max number of connections tracked", + :parameters => { + "net.netfilter.nf_conntrack_max" => "65536" + } + } }, :tilecache => { - :tile_parent => "orm.openstreetmap.org" + :tile_parent => "sanfrancisco.render.openstreetmap.org" } ) run_list( "role[prgmr]", + "role[geodns]", "role[tilecache]" )