From 47bf9a94cd3fa549fb76a501fbf3c6d77035ab6f Mon Sep 17 00:00:00 2001 From: Jimbo Date: Thu, 24 Oct 2024 23:04:34 -0400 Subject: [PATCH] Add another domain, fix the mailserver from being able to recieve --- .../server/mailserver/simplenix/default.nix | 17 ++++++++++++++--- variables/secrets/default.nix | Bin 2466 -> 2497 bytes 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix index f192bb37..b36c04c4 100644 --- a/modules/system/services/server/mailserver/simplenix/default.nix +++ b/modules/system/services/server/mailserver/simplenix/default.nix @@ -7,7 +7,12 @@ mailserver = rec { enable = true; - domains = [ "${config.secrets.jimDomain}" ]; + domains = [ + "${config.secrets.jimDomain}" + "${config.secrets.jimDomain2}" + "${config.secrets.lunaDomain}" + "${config.secrets.cornDomain}" + ]; fqdn = "mx.${config.secrets.jimDomain}"; certificateScheme = "acme-nginx"; localDnsResolver = false; @@ -26,9 +31,15 @@ hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash; sendOnly = true; }; - "jimbo@${config.secrets.jimDomain}" = { + "jimbo@${config.secrets.jimDomain2}" = { hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash; - aliases = [ "james@${config.secrets.jimDomain}" "contact@${config.secrets.jimDomain}" ]; + aliases = [ + "jimbo@${config.secrets.jimDomain}" + "james@${config.secrets.jimDomain}" + "james@${config.secrets.jimDomain2}" + "contact@${config.secrets.jimDomain}" + "contact@${config.secrets.jimDomain2}" + ]; }; "luna@${config.secrets.lunaDomain}" = { hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash; diff --git a/variables/secrets/default.nix b/variables/secrets/default.nix index 1215c21e8a195d07d9bab7bc3d457ba5dd7f478d..0cbd023f7a04ac7ef1ef3441fce5ee46316b423d 100644 GIT binary patch literal 2497 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 literal 2466 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 I*^Y(60BYsgqyPW_