X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c92e7b3b2523b42901d85705797bbd62bda59831..2cf386791e81bc3a0ea80967961711369223c102:/roles/mail.rb?ds=inline diff --git a/roles/mail.rb b/roles/mail.rb index 73fe22e4a..c1c7d307c 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -8,34 +8,47 @@ default_attributes( "osm.org", "noreply.openstreetmap.org", "openstreetmap.co.uk", - "openstreetmap.org.uk" + "openstreetmap.org.uk", + "openstreetmap.com", + "openstreetmap.io", + "openstreetmap.pro", + "openstreetmaps.org", + "osm.io" + ], + :daemon_smtp_ports => [25, 26], + :certificate_names => [ + "mail.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" ], - :daemon_smtp_ports => [ 25, 26 ], :smarthost_name => "mail.openstreetmap.org", :smarthost_via => false, - :dns_blacklists => [ "sbl-xbl.spamhaus.org" ], + :dns_blacklists => ["zen.spamhaus.org"], :routes => { :messages => { :comment => "messages.openstreetmap.org", - :domains => [ "messages.openstreetmap.org" ], - :host => [ "spike-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org" ] + :domains => ["messages.openstreetmap.org"], + :host => ["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" - }, - :tickets => { - :comment => "tickets.openstreetmap.org", - :domains => [ "tickets.openstreetmap.org" ], + :domains => ["otrs.openstreetmap.org"], :host => "ridley.ucl.openstreetmap.org" }, - :crm => { - :comment => "crm.osmfoundation.org", - :domains => [ "crm.osmfoundation.org" ], + :join => { + :comment => "join.osmfoundation.org", + :domains => ["join.osmfoundation.org"], :host => "ridley.ucl.openstreetmap.org" } }, + :dkim_selectors => { + "openstreetmap.org" => "20200301" + }, :aliases => { "abuse" => "root", "postmaster" => "root", @@ -44,7 +57,6 @@ default_attributes( "rails" => "root", "trac" => "root", "munin" => "root", - "thinkup" => "root", "www-data" => "root", "osmbackup" => "root", "noreply" => "/dev/null", @@ -60,14 +72,15 @@ default_attributes( "support" => "support@otrs.openstreetmap.org", "memorial" => "communication@osmfoundation.org", "legal" => "legal@osmfoundation.org", - "dmca" => "dmca@osmfoundation.org" + "dmca" => "dmca@osmfoundation.org", + "program-sotm" => "sotm-program@otrs.openstreetmap.org" }, :private_aliases => "mail" }, :munin => { :plugins => { :exim_mailqueue => { - :mails => { + :mails => { :warning => 500, :critical => 1000 } @@ -78,5 +91,6 @@ default_attributes( run_list( "recipe[clamav]", + "recipe[exim]", "recipe[spamassassin]" )