summary refs log tree commit diff
path: root/nixos/modules/services/mail/postfix.nix
diff options
context:
space:
mode:
authorViktor Kleen <viktor@kleen.org>2017-11-05 09:42:40 -0800
committerViktor Kleen <viktor@kleen.org>2020-11-23 23:46:06 +0000
commit6216c843ed79b5bc09a5f2cf522a0cfe7a21091b (patch)
tree110a113187ac6f30d082755505b18f3271eb2b41 /nixos/modules/services/mail/postfix.nix
parentd1ca119619e7d2e51485325335ea0b1924ee4fe3 (diff)
downloadnixpkgs-6216c843ed79b5bc09a5f2cf522a0cfe7a21091b.tar
nixpkgs-6216c843ed79b5bc09a5f2cf522a0cfe7a21091b.tar.gz
nixpkgs-6216c843ed79b5bc09a5f2cf522a0cfe7a21091b.tar.bz2
nixpkgs-6216c843ed79b5bc09a5f2cf522a0cfe7a21091b.tar.lz
nixpkgs-6216c843ed79b5bc09a5f2cf522a0cfe7a21091b.tar.xz
nixpkgs-6216c843ed79b5bc09a5f2cf522a0cfe7a21091b.tar.zst
nixpkgs-6216c843ed79b5bc09a5f2cf522a0cfe7a21091b.zip
nixos/postfix: make postfix.enableSmtp work again
This fixes issue #104715.
Diffstat (limited to 'nixos/modules/services/mail/postfix.nix')
-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 fd4d16cdc37..319b3b63844 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";