From c96571365659eba77d22991b2d5d47ff53c0b114 Mon Sep 17 00:00:00 2001
From: Malte Brandy <malte.brandy@maralorn.de>
Date: Sun, 6 Jun 2021 03:02:35 +0200
Subject: [PATCH] Fix domains.

---
 nixos/machines/hera/mail.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/machines/hera/mail.nix b/nixos/machines/hera/mail.nix
index 96672d17..16caaed0 100644
--- a/nixos/machines/hera/mail.nix
+++ b/nixos/machines/hera/mail.nix
@@ -1,6 +1,7 @@
 { pkgs, config, lib, ... }:
 let
   certPath = "/var/lib/acme/hera.m-0.eu";
+  nonMailboxDomains = [ "lists.maralorn.de" ];
 in
 {
   networking.firewall.allowedTCPPorts = [ 25 143 587 993 ];
@@ -40,8 +41,8 @@ in
       transport = "email2matrix.maralorn.de smtp:[::1]:2525";
       config = {
         # Allow TLSv1 because we need to be able to receive mail from legacy servers.
-        smtpd_tls_protocols = lib.mkForce
-          "TLSv1.3, TLSv1.2, TLSv1.1, TLSv1, !SSLv2, !SSLv3";
+        smtpd_tls_protocols = lib.mkForce "TLSv1.3, TLSv1.2, TLSv1.1, TLSv1, !SSLv2, !SSLv3";
+        virtual_mailbox_domains = lib.mkForce (builtins.toFile "vhosts" (lib.concatStringsSep "\n" (builtins.filter (x: !builtins.elem x nonMailboxDomains) config.mailserver.domains)));
       };
     };
   };
@@ -51,7 +52,7 @@ in
     enableImapSsl = true;
     fqdn = "hera.m-0.eu";
     rewriteMessageId = true;
-    domains = [ "m-0.eu" "maralorn.de" "choreutes.de" "mathechor.de" ];
+    domains = [ "m-0.eu" "maralorn.de" "choreutes.de" "mathechor.de" "lists.maralorn.de" ];
     forwards = pkgs.privateValue { } "mail/forwards";
     loginAccounts = pkgs.privateValue { } "mail/users";
     hierarchySeparator = "/";