X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/f9e3e2a61aca2a356d5e3f69b3f3f6f3c6986ce9..a9a6340f48df36525008416dc65cd76a1d700821:/roles/shenron.rb?ds=inline diff --git a/roles/shenron.rb b/roles/shenron.rb index 03b2cedc3..f91677226 100644 --- a/roles/shenron.rb +++ b/roles/shenron.rb @@ -15,12 +15,14 @@ default_attributes( :ignore => %w[in6] } }, - :mcelog => { - :enabled => false - }, :modules => [ "it87" ] + }, + :prometheus => { + :metrics => { + :exim_queue_limit => { :metric => 250 } + } } ) @@ -28,33 +30,26 @@ override_attributes( :networking => { :dnssec => "false", :interfaces => { - :external_ipv4 => { + :external => { :interface => "eth0", :role => :external, - :family => :inet, - :address => "212.110.172.32", - :prefix => "26", - :gateway => "212.110.172.1" - }, - :external_ipv6 => { - :interface => "eth0", - :role => :external, - :family => :inet6, - :address => "2001:41c9:1:400::32", - :prefix => "64", - :gateway => "fe80::1" + :inet => { + :address => "212.110.172.32", + :prefix => "26", + :gateway => "212.110.172.1" + }, + :inet6 => { + :address => "2001:41c9:1:400::32", + :prefix => "64", + :gateway => "fe80::1" + } } - }, - # Do not use Cloudflare Public DNS as it does not support ECS as required by https://www.spamhaus.org/organization/dnsblusage/ - # https://www.spamhaus.org/news/article/816/service-update-spamhaus-dnsbl-users-who-query-via-cloudflare-dns-need-to-make-changes-to-email-set-up - :nameservers => ["8.8.8.8", "8.8.4.4", "2001:4860:4860::8888", "2001:4860:4860::8844"], - :private_address => "10.0.16.100" + } } ) run_list( "role[bytemark]", - "role[mail]", "role[lists]", "role[osqa]" )