From 6cd9ce753dbfa015e193659c39f3cbeab50b5357 Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Fri, 23 Jan 2026 09:51:44 -0600
Subject: [PATCH] nixos/stalwart: add fallback to `/var/cache/stalwart-mail`

* update test to account for fallback
---
 nixos/modules/services/mail/stalwart.nix | 2 +-
 nixos/tests/stalwart/stalwart.nix        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/stalwart.nix b/nixos/modules/services/mail/stalwart.nix
index 2592377f9fba..c3f0753276e3 100644
--- a/nixos/modules/services/mail/stalwart.nix
+++ b/nixos/modules/services/mail/stalwart.nix
@@ -154,7 +154,7 @@ in
           );
         in
         {
-          path = "/var/cache/stalwart";
+          path = if useLegacyDefault then "/var/cache/stalwart-mail" else "/var/cache/stalwart";
           resource = lib.mkIf hasHttpListener (lib.mkDefault "file://${cfg.package.webadmin}/webadmin.zip");
         };
     };
diff --git a/nixos/tests/stalwart/stalwart.nix b/nixos/tests/stalwart/stalwart.nix
index d98d1df25008..2fa61e0e74fe 100644
--- a/nixos/tests/stalwart/stalwart.nix
+++ b/nixos/tests/stalwart/stalwart.nix
@@ -72,7 +72,7 @@ in
 
       main.succeed("test-imap-read")
 
-      main.succeed("test -d /var/cache/stalwart/STALWART_WEBADMIN")
+      main.succeed("test -d /var/cache/stalwart-mail/STALWART_WEBADMIN || test -d /var/cache/stalwart/STALWART_WEBADMIN")
       main.succeed("curl --fail http://localhost")
     '';