X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d0404b4ed36e373b85fd27b033634b896a73354c..40d704a6a1e8ef1ec71539bfa1f899fb57bc3cbb:/roles/mail.rb?ds=inline diff --git a/roles/mail.rb b/roles/mail.rb index 8df80ee50..de74af25a 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -18,16 +18,31 @@ default_attributes( :daemon_smtp_ports => [25, 26], :certificate_names => [ "mail.openstreetmap.org", - "a.mx.openstreetmap.org" + "a.mx.openstreetmap.org", + "a.mx.osm.org", + "a.mx.openstreetmap.com", + "a.mx.openstreetmap.io", + "a.mx.openstreetmap.pro", + "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"], + :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", @@ -38,8 +53,22 @@ default_attributes( :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 => "jakelong.dub.openstreetmap.org::2500" } }, + :dkim_selectors => { + "openstreetmap.org" => "20200301", + "osmfoundation.org" => "20201112" + }, :aliases => { "abuse" => "root", "postmaster" => "root", @@ -47,7 +76,7 @@ default_attributes( "clamav" => "root", "rails" => "root", "trac" => "root", - "munin" => "root", + "prometheus" => "root", "www-data" => "root", "osmbackup" => "root", "noreply" => "/dev/null", @@ -68,19 +97,15 @@ default_attributes( }, :private_aliases => "mail" }, - :munin => { - :plugins => { - :exim_mailqueue => { - :mails => { - :warning => 500, - :critical => 1000 - } - } + :prometheus => { + :metrics => { + :exim_queue_limit => { :metric => 2500 } } } ) run_list( "recipe[clamav]", + "recipe[exim]", "recipe[spamassassin]" )