From 415dc15e49149e7bb69084b3c4b0d1ecc3577a9b Mon Sep 17 00:00:00 2001
From: cliffmccarthy <16453869+cliffmccarthy@users.noreply.github.com>
Date: Tue, 4 Nov 2025 16:25:49 -0600
Subject: [PATCH] refactor: Move doveauth out of ChatmailVenvDeployer

- Revised DovecotDeployer to use _configure_remote_units() and
  _activate_remote_units() to deploy doveauth.  This keeps the
  Dovecot-related services in a single deployer class, leaving only
  services that are part of the chatmail project in
  ChatmailVenvDeployer.
- Removed doveauth from the unit list in ChatmailVenvDeployer.
---
 cmdeploy/src/cmdeploy/__init__.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py
index 809a6b05..0a9507fb 100644
--- a/cmdeploy/src/cmdeploy/__init__.py
+++ b/cmdeploy/src/cmdeploy/__init__.py
@@ -564,6 +564,7 @@ class DovecotDeployer(Deployer):
         super().__init__(**kwargs)
         self.config = config
         self.disable_mail = disable_mail
+        self.units = ["doveauth"]
 
     @staticmethod
     def install_impl():
@@ -574,9 +575,12 @@ class DovecotDeployer(Deployer):
             _install_dovecot_package("lmtpd", arch)
 
     def configure_impl(self):
+        _configure_remote_units(self.config.mail_domain, self.units)
         self.need_restart = _configure_dovecot(self.config)
 
     def activate_impl(self):
+        _activate_remote_units(self.units)
+
         restart = False if self.disable_mail else self.need_restart
 
         systemd.service(
@@ -978,7 +982,6 @@ class ChatmailVenvDeployer(Deployer):
         super().__init__(**kwargs)
         self.config = config
         self.units = (
-            "doveauth",
             "filtermail",
             "filtermail-incoming",
             "chatmail-metadata",