: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 => 25,
+ :smtp_accept_max => 200,
:smarthost_name => "mail.openstreetmap.org",
- :smarthost_via => false,
- :dns_blacklists => ["zen.spamhaus.org"],
+ :smarthost_via => nil,
+ :dns_blacklists => ["zen.spamhaus.org!&0.255.255.0"],
:routes => {
:messages => {
:comment => "messages.openstreetmap.org",
:domains => ["messages.openstreetmap.org"],
- :host => ["spike-01.openstreetmap.org", "spike-02.openstreetmap.org", "spike-03.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"],
- :host => "ridley.ucl.openstreetmap.org"
- },
:join => {
:comment => "join.osmfoundation.org",
:domains => ["join.osmfoundation.org"],
:host => "ridley.ucl.openstreetmap.org"
+ },
+ :community => {
+ :comment => "community.openstreetmap.org",
+ :domains => ["community.openstreetmap.org"],
+ :host => "jakelong.dub.openstreetmap.org::2500"
}
},
+ :dkim_selectors => {
+ "openstreetmap.org" => "20200301",
+ "osmfoundation.org" => "20201112"
+ },
:aliases => {
"abuse" => "root",
"postmaster" => "root",
"rails" => "root",
"trac" => "root",
"munin" => "root",
+ "prometheus" => "root",
"www-data" => "root",
"osmbackup" => "root",
"noreply" => "/dev/null",
"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"
},
}
}
}
+ },
+ :prometheus => {
+ :metrics => {
+ :exim_queue_limit => { :metric => 250 }
+ }
}
)
run_list(
"recipe[clamav]",
+ "recipe[exim]",
"recipe[spamassassin]"
)