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

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

View file

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