From 6d60321d8184f51f6dd4d0ad9e60f0753db8a9f5 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Mon, 24 Feb 2025 23:30:45 -0500
Subject: [PATCH] Update mailserver addresses

---
 modules/system/secrets/default.nix            | Bin 1901 -> 1901 bytes
 .../server/mailserver/simplenix/default.nix   |  17 +++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/system/secrets/default.nix b/modules/system/secrets/default.nix
index 19439f234b36c6a9a3bbaa909189c2b58c424651..195782cac692f3bca9410cddb6697abf893c0a53 100644
GIT binary patch
literal 1901
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

literal 1901
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

diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix
index 41cd3cf1..b12bc42d 100644
--- a/modules/system/services/server/mailserver/simplenix/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/default.nix
@@ -28,26 +28,27 @@
         hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
         aliases = [
           "james@${config.domains.p2}"
-          "jimjam4real@${config.domains.p2}"
+          "jimbo@${config.domains.blox}"
 
           "vice@${config.domains.p2}"
-          "vicee@${config.domains.p2}"
-          "viceebun@${config.domains.p2}"
+          "vice@${config.domains.blox}"
           "yara@${config.domains.p2}"
-          "yaralis@${config.domains.p2}"
 
           "contact@${config.domains.p2}"
         ];
       };
       "luna@${config.domains.luna}" = {
         hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
-        aliases = [ "luna@${config.domains.blox}" ];
+        aliases = [
+          "luna@${config.domains.blox}"
+          "contact@${config.domains.blox}"
+          "ibu@${config.domains.blox}"
+        ];
       };
-      "corn@${config.domains.corn}" = {
+      "contact@${config.domains.corn}" = {
         hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
-        aliases = [ "corn@${config.domains.blox}" ];
+        aliases = [ "freecorn@${config.domains.blox}" ];
       };
-      "tiny@${config.domains.corn}".hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
     };
   };