X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/04075ae665769fe13b97b5586c46ab28a51cc9d3..28360d6f39fa7fe8229ed64b4c93d1d0405add47:/roles/mail.rb diff --git a/roles/mail.rb b/roles/mail.rb index 288eb22d3..77b3bf3f4 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -18,8 +18,15 @@ 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 => 5, :smarthost_name => "mail.openstreetmap.org", :smarthost_via => false, :dns_blacklists => ["zen.spamhaus.org"], @@ -34,17 +41,16 @@ default_attributes( :domains => ["otrs.openstreetmap.org"], :host => "ridley.ucl.openstreetmap.org" }, - :tickets => { - :comment => "tickets.openstreetmap.org", - :domains => ["tickets.openstreetmap.org"], - :host => "ridley.ucl.openstreetmap.org" - }, :join => { :comment => "join.osmfoundation.org", :domains => ["join.osmfoundation.org"], :host => "ridley.ucl.openstreetmap.org" } }, + :dkim_selectors => { + "openstreetmap.org" => "20200301", + "osmfoundation.org" => "20201112" + }, :aliases => { "abuse" => "root", "postmaster" => "root", @@ -53,6 +59,7 @@ default_attributes( "rails" => "root", "trac" => "root", "munin" => "root", + "prometheus" => "root", "www-data" => "root", "osmbackup" => "root", "noreply" => "/dev/null", @@ -87,5 +94,6 @@ default_attributes( run_list( "recipe[clamav]", + "recipe[exim]", "recipe[spamassassin]" )