public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #104721 from vkleen/postfix-smtp-fix

Browse Source 
nixos.postfix: make postfix.enableSmtp work again
This commit is contained in:
Peter Simons 2020-11-24 08:58:35 +01:00 committed by GitHub
commit 58f29d3ca8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/modules/services/mail/postfix.nix
View File

@ -834,12 +834,6 @@ in
}; };
services.postfix.masterConfig = { services.postfix.masterConfig = {
smtp_inet = {
name = "smtp";
type = "inet";
private = false;
command = "smtpd";
};
pickup = { pickup = {
private = false; private = false;
wakeup = 60; wakeup = 60;
@ -921,6 +915,12 @@ in
in concatLists (mapAttrsToList mkKeyVal cfg.submissionOptions); in concatLists (mapAttrsToList mkKeyVal cfg.submissionOptions);
}; };
} // optionalAttrs cfg.enableSmtp { } // optionalAttrs cfg.enableSmtp {
smtp_inet = {
name = "smtp";
type = "inet";
private = false;
command = "smtpd";
};
smtp = {}; smtp = {};
relay = { relay = {
command = "smtp"; command = "smtp";