X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/c92e7b3b2523b42901d85705797bbd62bda59831..75f4f224fbe305d36c223c2fb03e285a49c1d3a7:/roles/mail.rb diff --git a/roles/mail.rb b/roles/mail.rb index 73fe22e4a..cb81cb360 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" ], + :join => { + :comment => "join.osmfoundation.org", + :domains => ["join.osmfoundation.org"], :host => "ridley.ucl.openstreetmap.org" } }, @@ -67,7 +72,7 @@ default_attributes( :munin => { :plugins => { :exim_mailqueue => { - :mails => { + :mails => { :warning => 500, :critical => 1000 }