about summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2020-11-24 08:58:35 +0100
committerGitHub <noreply@github.com>2020-11-24 08:58:35 +0100
commit58f29d3ca8a64e1ff98f63797a3a32584dd5d54b (patch)
tree4a9a55cdebc19405fdf05742966c263db2b99b84 /nixos/modules
parent4b610d814e09857c974ac2f65374a5baba0902ff (diff)
parent6216c843ed79b5bc09a5f2cf522a0cfe7a21091b (diff)
Merge pull request #104721 from vkleen/postfix-smtp-fix
nixos.postfix: make postfix.enableSmtp work again
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/mail/postfix.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index fd4d16cdc37b0..319b3b638444f 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -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";