X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/11618b6cc7af9c1f116f96ec5eeb8973e101f7c4..7241de1b2163bf5fbe1140ee7ecb60e1b68049df:/roles/mail.rb diff --git a/roles/mail.rb b/roles/mail.rb index c2de47e92..52c993568 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -29,28 +29,40 @@ default_attributes( :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" }, - :discourse => { - :comment => "community.osmfoundation.org", - :domains => ["community.osmfoundation.org"], - :host => "lockheed.ams.openstreetmap.org::2500" + :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 => { @@ -64,7 +76,6 @@ default_attributes( "clamav" => "root", "rails" => "root", "trac" => "root", - "munin" => "root", "prometheus" => "root", "www-data" => "root", "osmbackup" => "root", @@ -86,19 +97,9 @@ default_attributes( }, :private_aliases => "mail" }, - :munin => { - :plugins => { - :exim_mailqueue => { - :mails => { - :warning => 500, - :critical => 1000 - } - } - } - }, :prometheus => { :metrics => { - :exim_queue_limit => { :metric => 250 } + :exim_queue_limit => { :metric => 2500 } } } )