Preliminary multi-domain support

This commit is contained in:
John Boehr 2017-11-09 13:13:27 -08:00
parent 3d2f41dedc
commit ebd0f656ed
No known key found for this signature in database
GPG Key ID: 73B8EFB60708F699
6 changed files with 51 additions and 27 deletions

View File

@ -28,8 +28,14 @@ in
domain = mkOption {
type = types.str;
example = "example.com";
description = "The domain that this mail server serves. So far only one domain is supported";
example = "[ example.com ]";
description = "The primary domain that this mail server serves.";
};
extraDomains = mkOption {
type = types.listOf types.str;
example = "[ example.com ]";
description = "Extra domains that this mail server serves.";
};
hostPrefix = mkOption {

View File

@ -21,23 +21,34 @@ with (import ./common.nix { inherit config; });
let
cfg = config.mailserver;
allDomains = [ cfg.domain ] ++ cfg.extraDomains;
acmeRoot = "/var/lib/acme/acme-challenge";
in
{
config = with cfg; lib.mkIf (certificateScheme == 3) {
services.nginx = {
enable = true;
virtualHosts = {
domain = {
virtualHosts = genAttrs allDomains (domain: {
serverName = "${hostPrefix}.${domain}";
forceSSL = true;
enableACME = true;
locations."/" = {
root = "/var/www";
};
acmeRoot = "/var/lib/acme/acme-challenge";
};
acmeRoot = acmeRoot;
});
};
security.acme.certs."${hostPrefix}.${domain}" = {
# @todo what user/group should this run as?
user = "postfix"; # cfg.user;
group = "postfix"; # lib.mkDefault cfg.group;
domain = "${hostPrefix}.${domain}";
extraDomains = map (domain: "${hostPrefix}.${domain}") extraDomains;
webroot = acmeRoot;
# @todo should we reload postfix here?
postRun = ''
systemctl reload nginx
'';
};
};
}

View File

@ -19,17 +19,19 @@
with (import ./common.nix { inherit config; });
let
inherit (lib.strings) concatStringsSep;
cfg = config.mailserver;
allDomains = [ cfg.domain ] ++ cfg.extraDomains;
# valiases_postfix :: [ String ]
valiases_postfix = map
(from:
let to = cfg.virtualAliases.${from};
in "${from}@${cfg.domain} ${to}@${cfg.domain}")
in "${from} ${to}")
(builtins.attrNames cfg.virtualAliases);
# accountToIdentity :: User -> String
accountToIdentity = account: "${account.name}@${cfg.domain} ${account.name}@${cfg.domain}";
accountToIdentity = account: "${account.name} ${account.name}";
# vaccounts_identity :: [ String ]
vaccounts_identity = map accountToIdentity (lib.attrValues cfg.loginAccounts);
@ -38,7 +40,7 @@ let
valiases_file = builtins.toFile "valias" (lib.concatStringsSep "\n" valiases_postfix);
# vhosts_file :: Path
vhosts_file = builtins.toFile "vhosts" cfg.domain;
vhosts_file = builtins.toFile "vhosts" (concatStringsSep ", " allDomains);
# vaccounts_file :: Path
# see

View File

@ -30,7 +30,7 @@ let
# accountsToUser :: String -> UserRecord
accountsToUser = account: {
name = account.name + "@" + domain;
name = account.name;
isNormalUser = false;
group = vmailGroupName;
inherit (account) hashedPassword;

View File

@ -11,17 +11,22 @@
mailserver = {
enable = true;
domain = "example.com";
extraDomains = [ "example2.com" ];
hostPrefix = "mail";
loginAccounts = {
user1 = {
"user1@example.com" = {
hashedPassword = "$6$/z4n8AQl6K$kiOkBTWlZfBd7PvF5GsJ8PmPgdZsFGN1jPGZufxxr60PoR0oUsrvzm2oQiflyz5ir9fFJ.d/zKm/NgLXNUsNX/";
};
};
virtualAliases = {
info = "user1";
postmaster = "user1";
abuse = "user1";
"user1@example2.com" = "user1@example.com";
"info@example.com" = "user1@example.com";
"postmaster@example.com" = "user1@example.com";
"abuse@example.com" = "user1@example.com";
"info@example2.com" = "user1@example.com";
"postmaster@example2.com" = "user1@example.com";
"abuse@example2.com" = "user1@example.com";
};
};
};