From b560049e1e9866c5a9f16e4a749194411d64a11b Mon Sep 17 00:00:00 2001
From: Alejandro Soto <alejandro@34project.org>
Date: Sat, 11 Jan 2025 16:38:39 -0600
Subject: flake, sys: remove conduit

---
 sys/nspawn/dmz.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'sys/nspawn/dmz.nix')

diff --git a/sys/nspawn/dmz.nix b/sys/nspawn/dmz.nix
index 6c006d1..905e491 100644
--- a/sys/nspawn/dmz.nix
+++ b/sys/nspawn/dmz.nix
@@ -7,9 +7,6 @@ with lib; let
 
   hassPort = config.services.home-assistant.config.http.server_port;
   hassEnable = config.local.home-assistant.enable;
-
-  conduitPort = config.local.conduit.listenPort;
-  conduitEnable = config.local.conduit.enable;
 in
 {
   options.local.nspawn.dmz = {
@@ -70,7 +67,6 @@ in
   config = mkIf cfg.enable {
     local = {
       mailHost.mdaListen = cfg.hostAddr;
-      conduit.listenAddress = mkIf conduitEnable cfg.hostAddr;
 
       nspawn.dmz = {
         dmzAddr = dmzNet.hosts.dmz.v4.address;
@@ -98,11 +94,6 @@ in
                       enable = hassEnable;
                       proxyUrl = "http://${cfg.hostAddr}:${toString hassPort}";
                     };
-
-                    matrix = {
-                      enable = conduitEnable;
-                      proxyUrl = "http://${cfg.hostAddr}:${toString conduitPort}";
-                    };
                   };
                 };
 
@@ -222,8 +213,7 @@ in
 
       interfaces.ve-dmz = {
         allowedTCPPorts = [ mailHost.saslPort mailHost.lmtpPort ]
-          ++ optional hassEnable hassPort
-          ++ optional conduitEnable conduitPort;
+          ++ optional hassEnable hassPort;
 
         allowedUDPPorts = [ 67 ]; # DHCP
       };
-- 
cgit v1.2.3