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

nixos/postfix: make postfix.enableSmtp work again

Browse Source 
This fixes issue #104715.
This commit is contained in:
Viktor Kleen 2017-11-05 09:42:40 -08:00
parent d1ca119619
commit 6216c843ed
No known key found for this signature in database
GPG Key ID: 1D27D6D640BCCFB5
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";