X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a1fe1b73e197fcee92a684af0a62608067456159..341683a1e61fd9f3a9436167fbf039418264d493:/roles/mail.rb diff --git a/roles/mail.rb b/roles/mail.rb index c1c7d307c..9e3f9bdc9 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -26,9 +26,11 @@ 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"], + :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"], :routes => { :messages => { :comment => "messages.openstreetmap.org", @@ -44,10 +46,16 @@ default_attributes( :comment => "join.osmfoundation.org", :domains => ["join.osmfoundation.org"], :host => "ridley.ucl.openstreetmap.org" + }, + :community => { + :comment => "community.openstreetmap.org", + :domains => ["community.openstreetmap.org"], + :host => "jakelong.dub.openstreetmap.org::2500" } }, :dkim_selectors => { - "openstreetmap.org" => "20200301" + "openstreetmap.org" => "20200301", + "osmfoundation.org" => "20201112" }, :aliases => { "abuse" => "root", @@ -57,6 +65,7 @@ default_attributes( "rails" => "root", "trac" => "root", "munin" => "root", + "prometheus" => "root", "www-data" => "root", "osmbackup" => "root", "noreply" => "/dev/null", @@ -86,6 +95,11 @@ default_attributes( } } } + }, + :prometheus => { + :metrics => { + :exim_queue_limit => { :metric => 250 } + } } )