Merge pull request #507 from jfly/oops-new-opendkim-key

Update DKIM key for test mailserver
NixOS · Nov 9, 2024 · 8edb8de · 8edb8de
2 parents f966083 + 9a87a5a
commit 8edb8de
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/non-critical-infra/hosts/umbriel.nixos.org/README.md b/non-critical-infra/hosts/umbriel.nixos.org/README.md
@@ -4,4 +4,9 @@
 
 If you recreate `umbriel`, it will generate a new `DKIM` signature. That's
 ok to do, but you'll need to update the corresponding `mail._domainkey.*` `TXT`
-DNS record in `terraform/dns.tf`.
+DNS record in `terraform/dns.tf` with the generated key in
+`/var/dkim/mail-test.nixos.org.mail.txt`.
+
+TODO: declaratively manage the `DKIM` key once
+<https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/merge_requests/344>
+lands.
diff --git a/terraform/dns.tf b/terraform/dns.tf
@@ -346,7 +346,8 @@ locals {
     {
       hostname = "mail._domainkey.mail-test.nixos.org"
       type     = "TXT"
-      value    = "v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDTLW88xioTw4YUMSBw2+RO1+ASTbWNsqDwrpCmA+ikru4cWLEkx2JVEcms4Uxqrk2A8Qhfjvc8Oe026HdTXiTNEb9e+Sh0d/IR/eH5MFhiSUGrahZBx1FGVvMf5zfjYWZXn+7oXW8zNpxWd042hLMcY14G8v+/OBQ9IJL+ja3wFwIDAQAB"
+      # From `/var/dkim/mail-test.nixos.org.mail.txt` on `umbriel`.
+      value = "v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDG4Tx788TCAW/sv1h6JefVJChqbaot1yhycwEq0Uo5x9ZIyq43Dkxxl7LdsHIW75HMI7aTKQRru+5xQ26vQmwiIRFJlJlRSYzlZZ2xnFZPXQ27dXnFh7MxLGC7YEyQFksiA2xxgqtQSyIvwu1whm2WK0fXkoJf87SgTtVjjKjnkQIDAQAB"
     },
     {
       hostname = "_dmarc.mail-test.nixos.org"