@cryptotaxi247 / infra / commits / e47fbe09

Switch our MX record(s) from ImprovMX to `umbriel.nixos.org`

This is step 2 of https://github.com/NixOS/infra/issues/587

Jeremy Fleischman committed Mar 13, 2025 at 13:35 UTC e47fbe09e3592bd56c040ee2da718e50547c2eea
3 files changed +2 -20
build/pluto/prometheus/exporters/blackbox.nix
-8
@@ -117,14 +117,6 @@ in
117 "https://tracker.security.nixos.org"
118 ];
119 })
120 - # TODO: remove this static probe once `umbriel` is our MX record, and
121 - # ImprovMX is out of the picture.
122 - # https://github.com/NixOS/infra/issues/485
123 - (mkStaticProbe {
124 - module = "smtp_starttls";
125 - job_suffix = "_umbriel";
126 - targets = [ "umbriel.nixos.org:25" ];
127 - })
120 (mkDnsSdProbe "smtp_starttls" {
121 names = [
122 "nixos.org"
dns/nixos.org.js
+1 -9
@@ -7,16 +7,11 @@ D("nixos.org",
7 TXT("@", "google-site-verification=Pm5opvmNjJOwdb7JnuVJ_eFBPaZYWNcAavY-08AJoGc"),
8
9 // nixos.org mailing
10 - MX("@", 10, "mx1.improvmx.com."),
11 - MX("@", 10, "mx2.improvmx.com."),
12 - // TODO: Replace with the following MX records once we migrate away from ImprovMX
13 - //MX("@", "umbriel")
10 + MX("@", 10, "umbriel"),
11 SPF_BUILDER({
12 label: "@",
13 parts: [
14 "v=spf1",
18 - // TODO: Remove once we migrate away from ImprovMX
19 - "include:spf.improvmx.com",
15 "a:umbriel.nixos.org",
16 "~all"
17 ]
@@ -24,9 +19,6 @@ D("nixos.org",
19 DMARC_BUILDER({
20 policy: "none",
21 }),
27 - // TODO: Remove once we migrate away from ImprovMX
28 - CNAME("dkimprovmx1._domainkey", "dkimprovmx1.improvmx.com."),
29 - CNAME("dkimprovmx2._domainkey", "dkimprovmx2.improvmx.com."),
22
23 // discourse
24 A("discourse", "195.62.126.31"),
non-critical-infra/modules/mailserver/README.md
+1 -3
@@ -1,8 +1,6 @@
1 # NixOS mailserver
2
3 -This module will [eventually][issue 485] provide mail services for `nixos.org`.
4 -
5 -[issue 485]: https://github.com/NixOS/infra/issues/485
3 +This module will provides mail services for `nixos.org`.
4
5 ## Mailing lists
6