Split domains into their own var file and update all files accordingly

This commit is contained in:
Jimbo 2024-10-24 23:42:09 -04:00
parent 47bf9a94cd
commit fe73fa0d1f
34 changed files with 143 additions and 117 deletions

View file

@ -8,46 +8,46 @@
mailserver = rec {
enable = true;
domains = [
"${config.secrets.jimDomain}"
"${config.secrets.jimDomain2}"
"${config.secrets.lunaDomain}"
"${config.secrets.cornDomain}"
"${config.domains.jim1}"
"${config.domains.jim2}"
"${config.domains.luna}"
"${config.domains.corn}"
];
fqdn = "mx.${config.secrets.jimDomain}";
fqdn = "mx.${config.domains.jim1}";
certificateScheme = "acme-nginx";
localDnsResolver = false;
redis.port = 1515;
dmarcReporting = {
enable = true;
domain = "${config.secrets.jimDomain}";
domain = "${config.domains.jim1}";
localpart = "noreply";
organizationName = "Jimbo's Files";
};
# A list of accounts, passwords generated with nix-shell -p mkpasswd --run 'mkpasswd -sm bcrypt'
loginAccounts = {
"noreply@${config.secrets.jimDomain}" = {
"noreply@${config.domains.jim1}" = {
hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
sendOnly = true;
};
"jimbo@${config.secrets.jimDomain2}" = {
"jimbo@${config.domains.jim12}" = {
hashedPasswordFile = pkgs.writeText "jimbo" config.secrets.jimboMailHash;
aliases = [
"jimbo@${config.secrets.jimDomain}"
"james@${config.secrets.jimDomain}"
"james@${config.secrets.jimDomain2}"
"contact@${config.secrets.jimDomain}"
"contact@${config.secrets.jimDomain2}"
"jimbo@${config.domains.jim1}"
"james@${config.domains.jim1}"
"james@${config.domains.jim2}"
"contact@${config.domains.jim1}"
"contact@${config.domains.jim2}"
];
};
"luna@${config.secrets.lunaDomain}" = {
"luna@${config.domains.luna}" = {
hashedPasswordFile = pkgs.writeText "luna" config.secrets.lunaMailHash;
};
"corn@${config.secrets.cornDomain}" = {
"corn@${config.domains.corn}" = {
hashedPasswordFile = pkgs.writeText "corn" config.secrets.cornMailHash;
};
"tiny@${config.secrets.cornDomain}" = {
"tiny@${config.domains.corn}" = {
hashedPasswordFile = pkgs.writeText "tiny" config.secrets.tinyMailHash;
};
};

View file

@ -1,6 +1,6 @@
{ pkgs, config, ... }:
{
services.nginx.virtualHosts."mx.${config.secrets.jimDomain}" = {
services.nginx.virtualHosts."mx.${config.domains.jim1}" = {
enableACME = true;
forceSSL = true;
locations."/" = {