From 82d1dc4549f3ba079505b6ebaa266e6d04d1cce4 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 2 Oct 2026 00:27:50 +0200 Subject: tests/email/*: Rename to stalwart email tests These tests explicitly test our stalwart email module. --- tests/by-name/em/email-http/nodes/mail_server.nix | 57 ----------------------- tests/by-name/em/email-http/nodes/user.nix | 26 ----------- 2 files changed, 83 deletions(-) delete mode 100644 tests/by-name/em/email-http/nodes/mail_server.nix delete mode 100644 tests/by-name/em/email-http/nodes/user.nix (limited to 'tests/by-name/em/email-http/nodes') diff --git a/tests/by-name/em/email-http/nodes/mail_server.nix b/tests/by-name/em/email-http/nodes/mail_server.nix deleted file mode 100644 index e94c4e9..0000000 --- a/tests/by-name/em/email-http/nodes/mail_server.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ - extraModules, - pkgs, - vhackPackages, -}: { - mkMailServer = serverName: principal: { - config, - lib, - nodes, - ... - }: { - imports = - extraModules - ++ [ - ../../../../../modules - ../../../../common/acme/client.nix - ]; - - environment.systemPackages = [ - pkgs.bind - pkgs.openssl - ]; - - networking.nameservers = lib.mkForce [ - nodes.name_server.networking.primaryIPAddress - nodes.name_server.networking.primaryIPv6Address - ]; - - age.identityPaths = ["${../../../../common/email/hostKey}"]; - - vhack = { - stalwart-mail = { - enable = true; - fqdn = "${serverName}.server.com"; - admin = "admin@${serverName}.server.com"; - security = { - dkimKeys = let - loadKey = name: { - dkimPublicKey = builtins.readFile (../../../../common/email/dkim + "/${name}/public"); - dkimPrivateKeyPath = ../../../../common/email/dkim + "/${name}/private.age"; - keyAlgorithm = "ed25519-sha256"; - }; - in { - "mail.server.com" = loadKey "mail1.server.com"; - "bob.com" = loadKey "bob.com"; - }; - verificationMode = "strict"; - }; - openFirewall = true; - principals = - if principal == null - then null - else [principal]; - }; - }; - }; -} diff --git a/tests/by-name/em/email-http/nodes/user.nix b/tests/by-name/em/email-http/nodes/user.nix deleted file mode 100644 index 73b9ff7..0000000 --- a/tests/by-name/em/email-http/nodes/user.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ - pkgs, - vhackPackages, -}: { - mkUser = user: serverName: { - nodes, - lib, - ... - }: { - imports = [ - ../../../../common/acme/client.nix - ]; - - environment.systemPackages = [ - pkgs.bind - pkgs.openssl - ]; - - networking.nameservers = lib.mkForce [ - nodes.name_server.networking.primaryIPAddress - nodes.name_server.networking.primaryIPv6Address - ]; - - users.users."${user}" = {isNormalUser = true;}; - }; -} -- cgit v1.3.1