mirror of
https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git
synced 2025-03-31 07:59:52 +05:00
opendkim: switch to expandable settings option
This commit is contained in:
parent
b4fbffe79c
commit
a6c3b1b28d
@ -58,18 +58,18 @@ in
|
||||
enable = true;
|
||||
selector = cfg.dkimSelector;
|
||||
keyPath = cfg.dkimKeyDirectory;
|
||||
domains = "csl:${builtins.concatStringsSep "," cfg.domains}";
|
||||
configFile = pkgs.writeText "opendkim.conf" (''
|
||||
Canonicalization ${cfg.dkimHeaderCanonicalization}/${cfg.dkimBodyCanonicalization}
|
||||
UMask 0002
|
||||
Socket ${dkim.socket}
|
||||
KeyTable file:${keyTable}
|
||||
SigningTable file:${signingTable}
|
||||
'' + (lib.optionalString cfg.debug ''
|
||||
Syslog yes
|
||||
SyslogSuccess yes
|
||||
LogWhy yes
|
||||
''));
|
||||
domains = "csl:${lib.concatStringsSep "," cfg.domains}";
|
||||
settings = {
|
||||
Canonicalization = "${cfg.dkimHeaderCanonicalization}/${cfg.dkimBodyCanonicalization}";
|
||||
UMask = "0002";
|
||||
Socket = dkim.socket;
|
||||
KeyTable = "file:${keyTable}";
|
||||
SigningTable = "file:${signingTable}";
|
||||
} // lib.optionalAttrs cfg.debug {
|
||||
Syslog = "yes";
|
||||
SyslogSuccess = "yes";
|
||||
LogWhy = "yes";
|
||||
};
|
||||
};
|
||||
|
||||
users.users = optionalAttrs (config.services.postfix.user == "postfix") {
|
||||
|
Loading…
x
Reference in New Issue
Block a user