X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/ff044920428608b2c04507ad52d6ab52c9d6555f..2dbf9f83e1f0d1ace37b31914d7221d494e689c6:/roles/mail.rb diff --git a/roles/mail.rb b/roles/mail.rb index 79c65d0d4..d4cb37518 100644 --- a/roles/mail.rb +++ b/roles/mail.rb @@ -8,31 +8,36 @@ 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 ], + :daemon_smtp_ports => [25, 26], :smarthost_name => "mail.openstreetmap.org", :smarthost_via => false, - :dns_blacklists => [ "sbl-xbl.spamhaus.org" ], + :dns_blacklists => ["sbl-xbl.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-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.openstreetmap.org"] }, :otrs => { :comment => "otrs.openstreetmap.org", - :domains => [ "otrs.openstreetmap.org" ], + :domains => ["otrs.openstreetmap.org"], :host => "ridley.ucl.openstreetmap.org" }, :tickets => { :comment => "tickets.openstreetmap.org", - :domains => [ "tickets.openstreetmap.org" ], + :domains => ["tickets.openstreetmap.org"], :host => "ridley.ucl.openstreetmap.org" }, :crm => { :comment => "crm.osmfoundation.org", - :domains => [ "crm.osmfoundation.org" ], + :domains => ["crm.osmfoundation.org"], :host => "ridley.ucl.openstreetmap.org" } },