X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/04075ae665769fe13b97b5586c46ab28a51cc9d3..b7858d9e79876bd35ae711de3a9df4f57b50e0e2:/roles/mail.rb diff --git a/roles/mail.rb b/roles/mail.rb index 288eb22d3..516c2b89e 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -18,7 +18,13 @@ 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" ], :smarthost_name => "mail.openstreetmap.org", :smarthost_via => false, @@ -34,11 +40,6 @@ 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"],