cqrenet/relay
3
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-16 22:08:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Add MtastsDeployer

Browse Source 
- This splits the existing _uninstall_mta_sts_daemon() routine into
  methods for the configure and activate stages.
This commit is contained in:
cliffmccarthy
2025-09-11 07:21:41 -05:00
parent a1972acf8f
commit f904c4e400
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cmdeploy/src/cmdeploy/__init__.py
View File

@@ -329,21 +329,21 @@ class UnboundDeployer(Deployer):
) )
def _uninstall_mta_sts_daemon() -> None: class MtastsDeployer(Deployer):
# Remove configuration. def configure_impl(self):
files.file("/etc/mta-sts-daemon.yml", present=False) # Remove configuration.
files.file("/etc/mta-sts-daemon.yml", present=False)
files.directory("/usr/local/lib/postfix-mta-sts-resolver", present=False)
files.file("/etc/systemd/system/mta-sts-daemon.service", present=False)
files.directory("/usr/local/lib/postfix-mta-sts-resolver", present=False) def activate_impl(self):
systemd.service(
files.file("/etc/systemd/system/mta-sts-daemon.service", present=False) name="Stop MTA-STS daemon",
service="mta-sts-daemon.service",
systemd.service( daemon_reload=True,
name="Stop MTA-STS daemon", running=False,
service="mta-sts-daemon.service", enabled=False,
daemon_reload=True, )
running=False,
enabled=False,
)
def _configure_postfix(config: Config, debug: bool = False) -> bool: def _configure_postfix(config: Config, debug: bool = False) -> bool:
@@ -933,6 +933,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
# Deploy acmetool to have TLS certificates. # Deploy acmetool to have TLS certificates.
acmetool_deployer = AcmetoolDeployer(email=config.acme_email, domains=tls_domains) acmetool_deployer = AcmetoolDeployer(email=config.acme_email, domains=tls_domains)
mtasts_deployer = MtastsDeployer()
opendkim_deployer = OpendkimDeployer(mail_domain=mail_domain) opendkim_deployer = OpendkimDeployer(mail_domain=mail_domain)
# Dovecot should be started before Postfix # Dovecot should be started before Postfix
@@ -949,6 +950,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
unbound_deployer, unbound_deployer,
iroh_deployer, iroh_deployer,
acmetool_deployer, acmetool_deployer,
mtasts_deployer,
opendkim_deployer, opendkim_deployer,
dovecot_deployer, dovecot_deployer,
postfix_deployer, postfix_deployer,
@@ -1044,6 +1046,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
packages="acl", packages="acl",
) )
mtasts_deployer.install()
opendkim_deployer.install() opendkim_deployer.install()
postfix_deployer.install() postfix_deployer.install()
dovecot_deployer.install() dovecot_deployer.install()
@@ -1072,7 +1075,8 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
dovecot_deployer.configure() dovecot_deployer.configure()
postfix_deployer.configure() postfix_deployer.configure()
nginx_deployer.configure() nginx_deployer.configure()
_uninstall_mta_sts_daemon() mtasts_deployer.configure()
mtasts_deployer.activate()
_remove_rspamd() _remove_rspamd()
opendkim_deployer.configure() opendkim_deployer.configure()