all repos — nixfiles @ 41184f849559e5f942fc9585300e47a3e18f1c05

System and user configuration, managed by nix and home-manager

linde: update postfix configuration structure

Alan Pearce
commit

41184f849559e5f942fc9585300e47a3e18f1c05

parent

354b2abe0045326d9bc898664cb7941146946311

1 file changed, 23 insertions(+), 21 deletions(-)

changed files
M system/hosts/linde.nix → system/hosts/linde.nix
@@ -443,31 +443,33 @@ smtpd_client_restrictions = "permit_inet_interfaces,reject";
       smtpd_tls_security_level = "none";
     };
     enableSubmissions = true;
-    destination = [ ];
-    domain = domain;
     virtual = ''
       @${config.networking.hostName}.${domain} alan
       alan ${email}
     '';
-    config = {
-      inet_interfaces = "loopback-only";
-      smtp_bind_address = "0.0.0.0";
-      smtp_bind_address6 = "::";
-    };
-    masterConfig."10.88.0.1:587" = {
-      type = "inet";
-      private = false;
-      command = "smtpd";
-      args = [
-        "-o"
-        "inet_interfaces=10.88.0.1"
-        "-o"
-        "mynetworks=10.88.0.0/16"
-        "-o"
-        "smtpd_client_restrictions=permit_mynetworks,reject"
-        "-o"
-        "smtpd_tls_security_level=none"
-      ];
+    settings = {
+      main = {
+        mydomain = domain;
+        mydestination = [ ];
+        inet_interfaces = "loopback-only";
+        smtp_bind_address = "0.0.0.0";
+        smtp_bind_address6 = "::";
+      };
+      master."10.88.0.1:587" = {
+        type = "inet";
+        private = false;
+        command = "smtpd";
+        args = [
+          "-o"
+          "inet_interfaces=10.88.0.1"
+          "-o"
+          "mynetworks=10.88.0.0/16"
+          "-o"
+          "smtpd_client_restrictions=permit_mynetworks,reject"
+          "-o"
+          "smtpd_tls_security_level=none"
+        ];
+      };
     };
   };