cqrenet/relay
4
0
Fork 0
mirror of https://github.com/chatmail/relay.git synced 2026-05-20 21:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Add RspamdDeployer

Browse Source 
- This replaces the existing _remove_rspamd() routine with a method
  for the install stage.
This commit is contained in:
cliffmccarthy
2025-09-11 07:40:43 -05:00
parent 2029acc5a9
commit 33e6807ca4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -677,9 +677,10 @@ class NginxDeployer(Deployer):
self.need_restart = False self.need_restart = False
def _remove_rspamd() -> None: class RspamdDeployer(Deployer):
"""Remove rspamd""" @staticmethod
apt.packages(name="Remove rspamd", packages="rspamd", present=False) def install_impl():
apt.packages(name="Remove rspamd", packages="rspamd", present=False)
def check_config(config): def check_config(config):
@@ -943,6 +944,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
postfix_deployer = PostfixDeployer(config=config, disable_mail=disable_mail) postfix_deployer = PostfixDeployer(config=config, disable_mail=disable_mail)
nginx_deployer = NginxDeployer(config=config) nginx_deployer = NginxDeployer(config=config)
rspamd_deployer = RspamdDeployer()
journald_deployer = JournaldDeployer() journald_deployer = JournaldDeployer()
mtail_deployer = MtailDeployer(mtail_address=config.mtail_address) mtail_deployer = MtailDeployer(mtail_address=config.mtail_address)
@@ -955,6 +957,7 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
dovecot_deployer, dovecot_deployer,
postfix_deployer, postfix_deployer,
nginx_deployer, nginx_deployer,
rspamd_deployer,
journald_deployer, journald_deployer,
mtail_deployer, mtail_deployer,
] ]
@@ -1078,13 +1081,15 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
mtasts_deployer.configure() mtasts_deployer.configure()
mtasts_deployer.activate() mtasts_deployer.activate()
_remove_rspamd() rspamd_deployer.install()
rspamd_deployer.configure()
opendkim_deployer.configure() opendkim_deployer.configure()
opendkim_deployer.activate() opendkim_deployer.activate()
dovecot_deployer.activate() dovecot_deployer.activate()
postfix_deployer.activate() postfix_deployer.activate()
nginx_deployer.activate() nginx_deployer.activate()
rspamd_deployer.activate()
systemd.service( systemd.service(
name="Start and enable fcgiwrap", name="Start and enable fcgiwrap",