From 95b84e3a61cefd9e282d4485797b3dd7e7d6d276 Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 8 Feb 2026 22:35:36 -0600
Subject: trivionomicon: mediawiki: formatting

---
 trivionomicon/modules/mediawiki/options.nix | 42 ++++++++++++++---------------
 trivionomicon/modules/mediawiki/sys.nix     |  3 ++-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/trivionomicon/modules/mediawiki/options.nix b/trivionomicon/modules/mediawiki/options.nix
index 06acbf1..9fe0723 100644
--- a/trivionomicon/modules/mediawiki/options.nix
+++ b/trivionomicon/modules/mediawiki/options.nix
@@ -12,21 +12,21 @@ with lib.types; {
       description = "name of the wiki";
       example = "posixlycorrect wiki";
     };
-    
+
     passwordFile = lib.mkOption {
       type = types.path;
       description = "path of passwordfile for mediawiki";
       example = "/run/keys/mediawiki-password";
     };
-    
+
     skins = lib.mkOption {
       type = types.attrsOf (types.nullOr str);
       description = "skins for mediawiki";
-      example = ''{
-        citizen = "flakes.mediawikiSkinCitizen";
-      };'';
+      example = ''        {
+                citizen = "flakes.mediawikiSkinCitizen";
+              };'';
     };
-    
+
     extraConfig = lib.mkOption {
       type = str;
       example = ''
@@ -52,21 +52,21 @@ with lib.types; {
     extensions = lib.mkOption {
       type = types.attrsOf (types.nullOr types.path);
       description = "some extensions are included and can enabled by passing null";
-      example = ''{
-        VisualEditor = null;
-        CategoryTree = null;
-        CiteThisPage = null;
-        Scribunto = null;
-        Cite = null;
-        CodeEditor = null;
-        Math = null;
-        MultimediaViewer = null;
-        PdfHandler = null;
-        Poem = null;
-        SecureLinkFixer = null;
-        WikiEditor = null;
-        ParserFunctions = null;
-      };'';
+      example = ''        {
+                VisualEditor = null;
+                CategoryTree = null;
+                CiteThisPage = null;
+                Scribunto = null;
+                Cite = null;
+                CodeEditor = null;
+                Math = null;
+                MultimediaViewer = null;
+                PdfHandler = null;
+                Poem = null;
+                SecureLinkFixer = null;
+                WikiEditor = null;
+                ParserFunctions = null;
+              };'';
     };
   };
 }
diff --git a/trivionomicon/modules/mediawiki/sys.nix b/trivionomicon/modules/mediawiki/sys.nix
index 525ec3e..b6a9273 100644
--- a/trivionomicon/modules/mediawiki/sys.nix
+++ b/trivionomicon/modules/mediawiki/sys.nix
@@ -4,7 +4,8 @@
   cfg,
   doctrine,
   ...
-}: with lib; {
+}:
+with lib; {
   services = {
     nginx = {
       virtualHosts.${cfg.hostName} = {
-- 
cgit v1.2.3


From 80c4c471d2b3e782312db0d524cbc24acd94ca5e Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sun, 8 Feb 2026 22:36:54 -0600
Subject: sys/mta: set the SMTP bind address for the primary MX instance

---
 sys/mta/default.nix | 5 ++---
 sys/nspawn/dmz.nix  | 9 ++++++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/mta/default.nix b/sys/mta/default.nix
index 15476bf..004e2ae 100644
--- a/sys/mta/default.nix
+++ b/sys/mta/default.nix
@@ -47,7 +47,7 @@ in {
       type = types.port;
     };
 
-    relayListen = mkOption {
+    mtaListen = mkOption {
       type = types.str;
     };
   };
@@ -147,6 +147,7 @@ in {
           {
             mydomain = domain;
             myhostname = mtaDomain.main;
+            inet_interfaces = [cfg.mtaListen];
 
             myorigin = "$mydomain";
             #TODO: check_recipient_access para rechazar localhost desde afuera
@@ -217,8 +218,6 @@ in {
             milter_default_action = "accept";
           }
           // optionalAttrs isBackup {
-            inet_interfaces = [cfg.relayListen];
-
             smtpd_relay_restrictions = [
               "reject_unauth_destination"
             ];
diff --git a/sys/nspawn/dmz.nix b/sys/nspawn/dmz.nix
index 4cb3901..cf290a4 100644
--- a/sys/nspawn/dmz.nix
+++ b/sys/nspawn/dmz.nix
@@ -36,6 +36,11 @@ in {
       readOnly = true;
     };
 
+    mtaAddr6 = mkOption {
+      type = types.str;
+      readOnly = true;
+    };
+
     system = mkOption {
       type = types.raw;
     };
@@ -64,6 +69,7 @@ in {
       mailHost.mdaListen = cfg.hostAddr6;
 
       nspawn.dmz = {
+        dmzAddr6 = dmzNet.hosts.mta.v6.address;
         hostAddr6 = dmzNet.hosts.gateway.v6.address;
 
         system = let
@@ -78,7 +84,8 @@ in {
 
                 mta = {
                   mdaAddr = "[${mailHost.mdaListen}]";
-                  inherit (mailHost) saslPort lmtpPort;
+                  mtaListen = cfg.mtaAddr6;
+                  inherit (mailHost) mtaListen saslPort lmtpPort;
                 };
 
                 web.sites = {
-- 
cgit v1.2.3