sys/mta: 25.11 updates

1 files changed, 18 insertions, 22 deletions

diff --git a/sys/mta/default.nix b/sys/mta/default.nix
index 57c1c27..15476bf 100644
--- a/sys/mta/default.nix
+++ b/sys/mta/default.nix
@@ -76,26 +76,6 @@ in {
         enableSmtp = true;
         enableSubmissions = isPrimary;
 
-        inherit domain;
-        hostname = mtaDomain.main;
-
-        #TODO: check_recipient_access para rechazar localhost desde afuera
-        destination = optionals isPrimary ["localhost" "$mydomain"];
-        origin = "$mydomain";
-
-        networksStyle = "host";
-
-        relayHost = optionalString isBackup domains.smtp.main;
-        lookupMX = false;
-
-        relayDomains =
-          if isBackup
-          then allDomains
-          else null;
-
-        sslKey = "${cert}/key.pem";
-        sslCert = "${cert}/fullchain.pem";
-
         # También es postmaster
         rootAlias = config.local.sysadmin;
 
@@ -163,12 +143,28 @@ in {
               virtual)));
         };
 
-        config =
+        settings.main =
           {
+            mydomain = domain;
+            myhostname = mtaDomain.main;
+
+            myorigin = "$mydomain";
+            #TODO: check_recipient_access para rechazar localhost desde afuera
+            mydestination = optionals isPrimary ["localhost" "$mydomain"];
+            mynetworks_style = "host";
+
+            relayhost = optional isBackup "[${domains.smtp.main}]";
+            relay_domains =
+              if isBackup
+              then allDomains
+              else null;
+
+            smtpd_tls_chain_files = ["${cert}/key.pem" "${cert}/fullchain.pem"];
+
             # user+extension@domain.tld
             recipient_delimiter = optionalString isPrimary "+";
 
-            message_size_limit = toString (50 * 1048576);
+            message_size_limit = 50 * 1048576;
 
             local_transport = mdaTransport;
             virtual_transport = mdaTransport;