From 9dc7450f47587ac555f97615204e9efa268500be Mon Sep 17 00:00:00 2001
From: Darren Rambaud <225436867+debtquity@users.noreply.github.com>
Date: Thu, 22 Jan 2026 18:02:44 -0600
Subject: [PATCH] stalwart: remove refs to `stalwart-mail`

* re-name systemd service
* update test
---
 nixos/modules/services/mail/stalwart.nix | 6 +++---
 nixos/tests/stalwart/stalwart-config.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/stalwart.nix b/nixos/modules/services/mail/stalwart.nix
index 72e4d35e7eb2..1bdc2db6b457 100644
--- a/nixos/modules/services/mail/stalwart.nix
+++ b/nixos/modules/services/mail/stalwart.nix
@@ -180,7 +180,7 @@ in
     ];
 
     systemd = {
-      services.stalwart-mail = {
+      services.stalwart = {
         description = "Stalwart Server";
         wantedBy = [ "multi-user.target" ];
         after = [
@@ -220,8 +220,8 @@ in
           StateDirectory = if useLegacyDefault then "stalwart-mail" else "stalwart";
 
           # Upstream uses "stalwart" as the username since 0.12.0
-          User = if useLegacyDefault then "stalwart-mail" else "${cfg.user}";
-          Group = if useLegacyDefault then "stalwart-mail" else "${cfg.group}";
+          User = "${cfg.user}";
+          Group = "${cfg.group}";
 
           # Bind standard privileged ports
           AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
diff --git a/nixos/tests/stalwart/stalwart-config.nix b/nixos/tests/stalwart/stalwart-config.nix
index 343f7d9caab8..7fcbf8aae41c 100644
--- a/nixos/tests/stalwart/stalwart-config.nix
+++ b/nixos/tests/stalwart/stalwart-config.nix
@@ -54,7 +54,7 @@ in
 
       store."rocksdb" = {
         type = "rocksdb";
-        path = "/var/lib/stalwart-mail/data";
+        path = "/var/lib/stalwart/data";
         compression = "lz4";
       };