Merge pull request #621 from jfly/rollback
Revert "Switch our MX record(s) from ImprovMX to `umbriel.nixos.org`"
Jeremy Fleischman committed
Apr 8, 2025 at 01:15 UTC
61cf7f25764bced4559f5ea29a3e1e8494a377c9
3 files changed
+20
-2
build/pluto/prometheus/exporters/blackbox.nix
+8
@@ -117,6 +117,14 @@ 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
+ })
128
(mkDnsSdProbe "smtp_starttls" {
129
names = [
130
"nixos.org"
dns/nixos.org.js
+9
-1
@@ -7,11 +7,16 @@ D("nixos.org",
7
TXT("@", "google-site-verification=Pm5opvmNjJOwdb7JnuVJ_eFBPaZYWNcAavY-08AJoGc"),
8
9
// nixos.org mailing
10
- MX("@", 10, "umbriel"),
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")
14
SPF_BUILDER({
15
label: "@",
16
parts: [
17
"v=spf1",
18
+ // TODO: Remove once we migrate away from ImprovMX
19
+ "include:spf.improvmx.com",
20
"a:umbriel.nixos.org",
21
"~all"
22
]
@@ -19,6 +24,9 @@ D("nixos.org",
24
DMARC_BUILDER({
25
policy: "none",
26
}),
27
+ // TODO: Remove once we migrate away from ImprovMX
28
+ CNAME("dkimprovmx1._domainkey", "dkimprovmx1.improvmx.com."),
29
+ CNAME("dkimprovmx2._domainkey", "dkimprovmx2.improvmx.com."),
30
31
// discourse
32
A("discourse", "195.62.126.31"),
non-critical-infra/modules/mailserver/README.md
+3
-1
@@ -1,6 +1,8 @@
1
# NixOS mailserver
2
3
-This module will provides mail services for `nixos.org`.
3
+This module will [eventually][issue 485] provide mail services for `nixos.org`.
4
+
5
+[issue 485]: https://github.com/NixOS/infra/issues/485
6
7
## Mailing lists
8