Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update DKIM key for test mailserver #507

Merged
merged 2 commits into from
Nov 9, 2024
Merged

Update DKIM key for test mailserver #507

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f7c27e5
macs: test chroot disable patch from nixpkgs#353709
mweinelt Nov 6, 2024
9a87a5a
Update DKIM key for test mailserver
jfly Nov 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions macs/nix-darwin.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ in
};

nix.package = pkgs.nixVersions.nix_2_24.overrideAttrs (oldAttrs: {
patches = oldAttrs.patches or [ ] ++ [
./disable-chroot.patch
];
patches = oldAttrs.patches or [ ] ++ [ ./disable-chroot.patch ];
});
nix.gc.automatic = true;
nix.gc.user = "";
Expand Down
7 changes: 6 additions & 1 deletion non-critical-infra/hosts/umbriel.nixos.org/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
3 changes: 2 additions & 1 deletion terraform/dns.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down