From ef4bd15026b83f487cf064e7b7ce098cc8aca375 Mon Sep 17 00:00:00 2001
From: Preston Pan <ret2pop@gmail.com>
Date: Thu, 12 Feb 2026 17:37:56 -0800
Subject: fix vps, maddy, everything works

---
 nix/modules/maddy.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'nix/modules/maddy.nix')

diff --git a/nix/modules/maddy.nix b/nix/modules/maddy.nix
index ab98f87..42f24f9 100644
--- a/nix/modules/maddy.nix
+++ b/nix/modules/maddy.nix
@@ -3,9 +3,14 @@
   services.maddy = {
     enable = lib.mkDefault config.monorepo.profiles.server.enable;
     openFirewall = true;
-    hostName = "${config.monorepo.vars.remoteHost}";
+    hostname = "${config.monorepo.vars.orgHost}";
     primaryDomain = "mail.${config.monorepo.vars.orgHost}";
+    localDomains = [
+      "$(primary_domain)"
+      "${config.monorepo.vars.orgHost}"
+    ];
     tls = {
+      loader = "file";
       certificates = [
         {
           keyPath = "/var/lib/acme/mail.${config.monorepo.vars.orgHost}/key.pem";
@@ -16,14 +21,12 @@
     config = builtins.replaceStrings [
       "imap tcp://0.0.0.0:143"
       "submission tcp://0.0.0.0:587"
-      "smtp tcp://0.0.0.0:25"
     ] [
       "imap tls://0.0.0.0:993 tcp://0.0.0.0:143"
       "submission tls://0.0.0.0:465 tcp://0.0.0.0:587"
-      "smtps tls://0.0.0.0:465 smtp tcp://0.0.0.0:25"
     ] options.services.maddy.config.default;
     ensureCredentials = {
-      "${config.monorepo.vars.userName}@localhost" = {
+      "${config.monorepo.vars.internetName}@${config.monorepo.vars.orgHost}" = {
         passwordFile = "/run/secrets/mail_password";
       };
     };
-- 
cgit v1.3