1 files changed, 25 insertions, 15 deletions

diff --git a/modules/by-name/ma/mail/module.nix b/modules/vhack/ma/mail/module.nix
index 55f2fb8..62ff684 100644
--- a/modules/by-name/ma/mail/module.nix
+++ b/modules/vhack/ma/mail/module.nix
@@ -27,12 +27,6 @@ in {
         mode = "0700";
       }
       {
-        directory = "/var/lib/mail/sieve";
-        user = "virtualMail";
-        group = "virtualMail";
-        mode = "0700";
-      }
-      {
         directory = "/var/lib/mail/vmail";
         user = "virtualMail";
         group = "virtualMail";
@@ -63,27 +57,32 @@ in {
         mode = "0700";
       }
     ];
+
     vhack.nginx.enable = true;
     security.acme.certs = {
       "${cfg.fqdn}" = {
         domain = cfg.fqdn;
       };
     };
+
     mailserver = {
       enable = true;
       inherit (cfg) fqdn;
 
-      useFsLayout = true;
+      stateVersion = 5;
 
-      extraVirtualAliases = {
+      aliases = {
         "abuse@vhack.eu" = all_admins;
         "postmaster@vhack.eu" = all_admins;
         "admin@vhack.eu" = all_admins;
       };
 
-      mailDirectory = "/var/lib/mail/vmail";
-      dkimKeyDirectory = "/var/lib/mail/dkim";
-      sieveDirectory = "/var/lib/mail/sieve";
+      storage = {
+        directoryLayout = "fs";
+        path = "/var/lib/mail/vmail";
+      };
+
+      dkim.keyDirectory = "/var/lib/mail/dkim";
       backup.snapshotRoot = "/var/lib/mail/backup";
 
       enableImap = false;
@@ -95,9 +94,8 @@ in {
       enableSubmissionSsl = true;
       openFirewall = true;
 
-      keyFile = "/var/lib/acme/${cfg.fqdn}/key.pem";
-      certificateScheme = "acme";
-      certificateFile = "/var/lib/acme/${cfg.fqdn}/fullchain.pem";
+      # Reference the existing ACME configuration created by nginx
+      x509.useACMEHost = cfg.fqdn;
 
       domains = [
         "vhack.eu"
@@ -108,9 +106,11 @@ in {
         "sils.li"
         "nightingale.sils.li"
         "sils.sils.li"
+
+        "jaki.li"
       ];
 
-      loginAccounts = {
+      accounts = {
         "sils@vhack.eu" = {
           hashedPassword = "$2b$05$RW/Svgk7iGxvP5W7ZwUZ1e.a3fj4fteevb2MtfFYYD0d1DQ17y9Fm";
         };
@@ -140,6 +140,14 @@ in {
             "@sils.li"
           ];
         };
+        "mail@jaki.li" = {
+          hashedPassword = "$y$j9T$jaG/lkAOfYXUNiJt11DoE.$ZKTeev6b5TCBEXZzNLH12hOmy5mL.Fitp0V6saWXR73";
+          aliases = [
+            "postmaster@jaki.li"
+            "abuse@jaki.li"
+            "admin@jaki.li"
+          ];
+        };
 
         # Mail-Account used by hosted software
         "mastodon@vhack.eu" = {
@@ -156,11 +164,13 @@ in {
         knot-resolver.uid = config.vhack.constants.ids.uids.knot-resolver;
         redis-rspamd.uid = config.vhack.constants.ids.uids.redis-rspamd;
         rspamd.uid = config.vhack.constants.ids.uids.rspamd;
+        postfix-tlspol.uid = config.vhack.constants.ids.uids.postfix-tlspol;
       };
       groups = {
         knot-resolver.gid = lib.mkForce config.vhack.constants.ids.gids.knot-resolver;
         redis-rspamd.gid = config.vhack.constants.ids.gids.redis-rspamd;
         rspamd.gid = config.vhack.constants.ids.gids.rspamd;
+        postfix-tlspol.gid = config.vhack.constants.ids.gids.postfix-tlspol;
       };
     };
   };