Gonne/nixConfig
1
0
Fork 0
forked from Fachschaft/nixConfig
Code Pull requests Activity

Compare commits

base: Gonne:c078a05ad0011a45c23e6ab6bafa06c1491f6f81
Branches Tags
Gonne:main
Gonne:apostrophe
Gonne:kaalut2
Gonne:lobon
Gonne:update
Fachschaft:main
...
compare: Gonne:8f5e96de04cc8423484ece6349d51022caad8f6b
Branches Tags
Gonne:main
Gonne:apostrophe
Gonne:kaalut2
Gonne:lobon
Gonne:update
Fachschaft:main

2 commits
c078a05ad0 ... 8f5e96de04

Author SHA1 Message Date
Gonne
8f5e96de04 Update alias-to-sieve script to set Delivered-To headers on our forwarded mails. 
Fixes #65
 2025-03-26 13:47:40 +00:00
Gonne
98fe80676d
Fix DKIM config 2025-03-26 14:40:45 +01:00
2 changed files with 7 additions and 7 deletions
Show stats Expand all files Collapse all files

8
flake.lock generated
View file

@ -9,11 +9,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1742814048, "lastModified": 1742970612,
"narHash": "sha256-8BK8oLQcpxTsQQiOrP80pPWirdOIk50ecCZjkUYMLVI=", "narHash": "sha256-+/irvF5TgMTCyHWE30BhearVDmeMHRFSBG4D6kCGlHc=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "3570db39fda3627d60fbd4ef9c6326b3de074eb8", "rev": "a9a819e659c0fc1baa84c83c50ec839e6819249d",
"revCount": 23, "revCount": 24,
"type": "git", "type": "git",
"url": "https://gitea.mathebau.de/fachschaft/alias_to_sieve" "url": "https://gitea.mathebau.de/fachschaft/alias_to_sieve"
}, },

6
nixos/modules/mail.nix
View file

@ -240,7 +240,7 @@ in {
private-key = "%{file:/run/secrets/dkim_rsa}%"; private-key = "%{file:/run/secrets/dkim_rsa}%";
domain = "${domain}"; domain = "${domain}";
selector = "rsa-default"; selector = "rsa-default";
headers = ["From" "To" "Cc" "Date" "Subject" "Message-ID" "Organization" "MIME-Version" "Content-Type" "In-Reply-To" "References" "List-Id" "User-Agent" "Thread-Topic" "Thread-Index"]; # default from https://stalw.art/docs/smtp/authentication/dkim/sign#signatures headers = ["From" "To" "Cc" "Date" "Subject" "Message-ID" "Organization" "MIME-Version" "Content-Type" "In-Reply-To" "References" "List-Id" "Thread-Topic" "Thread-Index"]; # default from https://stalw.art/docs/smtp/authentication/dkim/sign#signatures except "User-Agent" which somehow breaks
algorithm = "rsa-sha256"; algorithm = "rsa-sha256";
canonicalization = "relaxed/relaxed"; canonicalization = "relaxed/relaxed";
}; };
@ -248,13 +248,13 @@ in {
private-key = "%{file:/run/secrets/dkim_ed25519}%"; private-key = "%{file:/run/secrets/dkim_ed25519}%";
domain = "${domain}"; domain = "${domain}";
selector = "ed-default"; selector = "ed-default";
headers = ["From" "To" "Cc" "Date" "Subject" "Message-ID" "Organization" "MIME-Version" "Content-Type" "In-Reply-To" "References" "List-Id" "User-Agent" "Thread-Topic" "Thread-Index"]; headers = ["From" "To" "Cc" "Date" "Subject" "Message-ID" "Organization" "MIME-Version" "Content-Type" "In-Reply-To" "References" "List-Id" "Thread-Topic" "Thread-Index"]; # default from https://stalw.art/docs/smtp/authentication/dkim/sign#signatures except "User-Agent" which somehow breaks
algorithm = "ed25519-sha256"; algorithm = "ed25519-sha256";
canonicalization = "relaxed/relaxed"; canonicalization = "relaxed/relaxed";
}; };
}; };
in in
map signatureTemplate (["lists.mathebau.de"] ++ (map ({domain, ...}: domain) cfg.domains)); lib.attrsets.mergeAttrsList (map signatureTemplate (["lists.mathebau.de"] ++ (map ({domain, ...}: domain) cfg.domains)));
authentication.fallback-admin = { authentication.fallback-admin = {
user = "admin"; user = "admin";