nixos/postfix: make postfix.enableSmtp work again

This fixes issue #104715.
This commit is contained in:
Viktor Kleen
2020-11-23 23:46:06 +00:00
parent d1ca119619
commit 6216c843ed
+6 -6
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";