public/mail-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Just forget domain-specefic FFS

Browse Source
This commit is contained in:
niten 2023-09-28 22:10:29 -07:00
parent 409d0e6207
commit e3e6305647
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dkim.nix
View File

@ -88,7 +88,7 @@ in {
services.opendkim = { services.opendkim = {
enable = true; enable = true;
# selector = cfg.selector; selector = cfg.selector;
domains = let domainString = concatStringsSep "," cfg.domains; domains = let domainString = concatStringsSep "," cfg.domains;
in "csl:${domainString}"; in "csl:${domainString}";
configFile = let configFile = let
@ -100,8 +100,8 @@ in {
in pkgs.writeText "opendkim.conf" '' in pkgs.writeText "opendkim.conf" ''
Canonicalization relaxed/simple Canonicalization relaxed/simple
Socket inet:${toString cfg.port} Socket inet:${toString cfg.port}
KeyTable file:${keyTableDir}/key.table # KeyTable file:${keyTableDir}/key.table
SigningTable file:${signingTableDir}/signing.table # SigningTable file:${signingTableDir}/signing.table
${optionalString cfg.debug debugString} ${optionalString cfg.debug debugString}
''; '';
}; };
@ -114,10 +114,10 @@ in {
services.opendkim = { services.opendkim = {
path = with pkgs; [ opendkim ]; path = with pkgs; [ opendkim ];
serviceConfig = { serviceConfig = {
ExecStartPre = [ # ExecStartPre = [
(pkgs.writeShellScript "ensure-dkim-certs.sh" # (pkgs.writeShellScript "ensure-dkim-certs.sh"
(ensureAllDkimCerts cfg.state-directory cfg.domains)) # (ensureAllDkimCerts cfg.state-directory cfg.domains))
]; # ];
ReadWritePaths = [ cfg.state-directory ]; ReadWritePaths = [ cfg.state-directory ];
ReadOnlyPaths = [ keyTableDir signingTableDir ]; ReadOnlyPaths = [ keyTableDir signingTableDir ];
}; };