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

nixos.postfix: make postfix.enableSmtp work again
2020-11-24 08:58:35 +01:00
parent 4b610d814e 6216c843ed
commit 58f29d3ca8
1 changed files with 6 additions and 6 deletions
--- 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";