2023-09-20

1 files changed, 4 insertions, 20 deletions

diff --git a/nixosConfigurations/manwe/mailserver.nix b/nixosConfigurations/manwe/mailserver/default.nix
index 389a9a0..4f58df7 100644
--- a/nixosConfigurations/manwe/mailserver.nix
+++ b/nixosConfigurations/manwe/mailserver/default.nix
@@ -7,6 +7,7 @@
 with lib; {
   imports = [inputs.simple-nixos-mailserver.nixosModule];
 
+  # Redis?
   ark.directories = with config.mailserver; [
     "/var/lib/dovecot"
     "/var/lib/postfix"
@@ -70,26 +71,9 @@ with lib; {
       password = requirePass;
     };
 
-    loginAccounts = with my.domain; {
-      "azahi@${shire}" = {
-        hashedPassword = "@HASHED_PASSWORD@";
-        aliases = [
-          "@${azahi}"
-          "@${rohan}"
-          "@${gondor}"
-          "abuse@${shire}"
-          "admin@${shire}"
-          "ceo@${shire}"
-          "postmaster@${shire}"
-          "root@${shire}"
-        ];
-      };
-      "samwise@${shire}" = {
-        hashedPassword = "@HASHED_PASSWORD@";
-        aliases = ["chad@${shire}"];
-        quota = "1G";
-      };
-    };
+    # Just a list of accounts with aliases and hasedPasswords. Not necessarily
+    # secret, but kept from prying eyes.
+    loginAccounts = import ./accounts.nix lib;
   };
 
   # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/241