X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/34891395c293a6fd10e0a622cb601b8e39d80e87..08be09e5a29886586d4955e6bdcc6592ed6e531e:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 6c2f747c1..209b35170 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -36,7 +36,7 @@ default_attributes( :mode => "802.3ad", :lacprate => "fast", :xmithashpolicy => "layer3+4", - :slaves => %w[eth0 eth1] + :slaves => %w[enp2s0f0 enp2s0f1] } }, :external => { @@ -66,31 +66,13 @@ default_attributes( } } }, - :rsyncd => { - :modules => { - :logs => { - :comment => "Log files", - :path => "/store/logs", - :read_only => false, - :write_only => true, - :list => false, - :uid => "www-data", - :gid => "www-data", - :transfer_logging => false, - :hosts_allow => [ - "193.60.236.0/24", # ucl external - "10.0.48.0/20", # amsterdam internal - "184.104.179.128/27", # amsterdam external - "2001:470:1:fa1::/64", # amsterdam external - "10.0.64.0/20", # dublin internal - "184.104.226.96/27", # dublin external - "2001:470:1:b3b::/64", # dublin external - "10.0.32.0/20", # bytemark internal - "89.16.162.16/28", # bytemark external - "2001:41c9:2:d6::/64", # bytemark external - "127.0.0.0/8", # localhost - "::1" # localhost - ] + :nginx => { + :cache => { + :proxy => { + :enable => true, + :keys_zone => "proxy_cache_zone:256M", + :inactive => "180d", + :max_size => "51200M" } } } @@ -100,6 +82,5 @@ run_list( "role[equinix-ams]", "role[gateway]", "recipe[rsyncd]", - "recipe[dhcpd]", - "recipe[imagery::tiler]", + "recipe[dhcpd]" )