X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/a1fe1b73e197fcee92a684af0a62608067456159..d544597a84d545711f90b687d924e010254aebc5:/roles/mail.rb diff --git a/roles/mail.rb b/roles/mail.rb index c1c7d307c..f434cd0e8 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -26,6 +26,8 @@ default_attributes( "a.mx.openstreetmaps.org", "a.mx.osm.io" ], + :queue_run_max => 25, + :smtp_accept_max => 200, :smarthost_name => "mail.openstreetmap.org", :smarthost_via => false, :dns_blacklists => ["zen.spamhaus.org"], @@ -47,7 +49,8 @@ default_attributes( } }, :dkim_selectors => { - "openstreetmap.org" => "20200301" + "openstreetmap.org" => "20200301", + "osmfoundation.org" => "20201112" }, :aliases => { "abuse" => "root", @@ -57,6 +60,7 @@ default_attributes( "rails" => "root", "trac" => "root", "munin" => "root", + "prometheus" => "root", "www-data" => "root", "osmbackup" => "root", "noreply" => "/dev/null", @@ -86,6 +90,11 @@ default_attributes( } } } + }, + :prometheus => { + :metrics => { + :exim_queue_limit => { :metric => 500 } + } } )