X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/62c7df43ae321c141822ff983952845866831cf1..2672b17a7b411fb2aa5ae1e9d8032acf85717f3b:/roles/mail.rb?ds=sidebyside diff --git a/roles/mail.rb b/roles/mail.rb index 9e3f9bdc9..6cf895493 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -29,13 +29,20 @@ default_attributes( :queue_run_max => 25, :smtp_accept_max => 200, :smarthost_name => "mail.openstreetmap.org", - :smarthost_via => false, + :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", @@ -47,6 +54,11 @@ default_attributes( :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"], @@ -98,7 +110,7 @@ default_attributes( }, :prometheus => { :metrics => { - :exim_queue_limit => { :metric => 250 } + :exim_queue_limit => { :metric => 2500 } } } )