X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ab47927c016597f8602b81dcdc168ad5c335389d..16c9e170f6e1df8c3618615410367f2fe89c41b1:/roles/mail.rb?ds=inline diff --git a/roles/mail.rb b/roles/mail.rb index 77b3bf3f4..52c993568 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -26,25 +26,43 @@ default_attributes( "a.mx.openstreetmaps.org", "a.mx.osm.io" ], - :queue_run_max => 5, + :queue_run_max => 25, + :smtp_accept_max => 200, :smarthost_name => "mail.openstreetmap.org", - :smarthost_via => false, - :dns_blacklists => ["zen.spamhaus.org"], + :smarthost_via => nil, + :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"], :routes => { :messages => { :comment => "messages.openstreetmap.org", :domains => ["messages.openstreetmap.org"], - :host => ["spike-06.openstreetmap.org", "spike-07.openstreetmap.org", "spike-08.openstreetmap.org"] + :host => [ + "spike-01.openstreetmap.org", + "spike-02.openstreetmap.org", + "spike-03.openstreetmap.org", + "spike-06.openstreetmap.org", + "spike-07.openstreetmap.org", + "spike-08.openstreetmap.org" + ] }, :otrs => { :comment => "otrs.openstreetmap.org", :domains => ["otrs.openstreetmap.org"], - :host => "ridley.ucl.openstreetmap.org" + :host => "naga.dub.openstreetmap.org" }, :join => { :comment => "join.osmfoundation.org", :domains => ["join.osmfoundation.org"], :host => "ridley.ucl.openstreetmap.org" + }, + :supporting => { + :comment => "supporting.openstreetmap.org", + :domains => ["supporting.openstreetmap.org"], + :host => "ridley.ucl.openstreetmap.org" + }, + :community => { + :comment => "community.openstreetmap.org", + :domains => ["community.openstreetmap.org"], + :host => "fume.dub.openstreetmap.org::2500" } }, :dkim_selectors => { @@ -58,7 +76,6 @@ default_attributes( "clamav" => "root", "rails" => "root", "trac" => "root", - "munin" => "root", "prometheus" => "root", "www-data" => "root", "osmbackup" => "root", @@ -80,14 +97,9 @@ default_attributes( }, :private_aliases => "mail" }, - :munin => { - :plugins => { - :exim_mailqueue => { - :mails => { - :warning => 500, - :critical => 1000 - } - } + :prometheus => { + :metrics => { + :exim_queue_limit => { :metric => 2500 } } } )