From a830d97bf9ad6e2b60ba3025d8bd36b8536f57a8 Mon Sep 17 00:00:00 2001
From: quitte <root@quitte>
Date: Sun, 17 Sep 2023 16:00:19 +0200
Subject: [PATCH] mail migration: on-metal fixes

---
 flake.nix                | 2 +-
 modules/mail/default.nix | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index 87a9710..48ea690 100755
--- a/flake.nix
+++ b/flake.nix
@@ -52,7 +52,7 @@
             ./modules/course-management.nix
             ./modules/gitea.nix
             {
-              fsr.domain = "staging.ifsr.de";
+              fsr.domain = "ifsr.de";
               sops.defaultSopsFile = ./secrets/quitte.yaml;
             }
           ];
diff --git a/modules/mail/default.nix b/modules/mail/default.nix
index 349c430..801fb77 100644
--- a/modules/mail/default.nix
+++ b/modules/mail/default.nix
@@ -32,6 +32,7 @@ in
 
   networking.firewall.allowedTCPPorts = [
     25 # insecure SMTP
+    143
     465
     587 # SMTP
     993 # IMAP
@@ -129,6 +130,7 @@ in
         mailbox_transport = "lmtp:unix:/run/dovecot2/dovecot-lmtp";
 
         transport_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" ];
+        virtual_alias_maps = [ "hash:/var/lib/mailman/data/postfix_vmap" ];
         local_recipient_maps = [ "hash:/var/lib/mailman/data/postfix_lmtp" "ldap:${config.sops.secrets."postfix_ldap_aliases".path}" "$alias_maps" ];
       };
     };
@@ -197,6 +199,12 @@ in
           }
           service_count = 1
         }
+
+	namespace inbox {
+	  separator = /
+	  inbox = yes
+	}
+
         service lmtp {
           unix_listener dovecot-lmtp {
             group = postfix