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

refactor: Reorder deploy_chatmail()

Browse Source 
- The previous commits that added Deployer classes mostly kept
  deployment operations in the same order that they were in before.
  To organize the process into separate stages for install, configure,
  and activate, we need to reorder the method calls.  This is the
  commit that does that, and thus this is the commit that has the
  largest effect on the order of operations.
- The calls for the deployer objects are all reordered here so that
  the methods are called in the same sequence for each stage.  This
  will allow us to collect the calls into loops in the next commit.
  This commit provides a way to see a diff showing exactly how the
  sequence changed.
- The sequence of deployers was largely based on preserving the order
  of the "activate" stage, as this seems like the place order might be
  the most likely to matter.  Installation of packages and
  configuration of files should generally be able to run in any order.
  (ChatmailDeployer handles updating the apt data, and therefore needs
  to be first, however.)
This commit is contained in:
cliffmccarthy
2025-10-14 08:18:50 -05:00
parent a9d3709663
commit e043c1baff
1 changed files with 51 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1117,6 +1117,32 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
line="nameserver 9.9.9.9",
)
port_services = [
(["master", "smtpd"], 25),
("unbound", 53),
("acmetool", 80),
(["imap-login", "dovecot"], 143),
("nginx", 443),
(["master", "smtpd"], 465),
(["master", "smtpd"], 587),
(["imap-login", "dovecot"], 993),
("iroh-relay", 3340),
("nginx", 8443),
(["master", "smtpd"], config.postfix_reinject_port),
(["master", "smtpd"], config.postfix_reinject_port_incoming),
("filtermail", config.filtermail_smtp_port),
("filtermail", config.filtermail_smtp_port_incoming),
]
for service, port in port_services:
print(f"Checking if port {port} is available for {service}...")
running_service = host.get_fact(Port, port=port)
if running_service:
if running_service not in service:
Out().red(
f"Deploy failed: port {port} is occupied by: {running_service}"
)
exit(1)
tls_domains = [mail_domain, f"mta-sts.{mail_domain}", f"www.{mail_domain}"]
chatmail_deployer = ChatmailDeployer(mail_domain=mail_domain)
@@ -1178,91 +1204,58 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
deployer.create_users()
chatmail_deployer.install()
turn_deployer.install()
turn_deployer.configure()
turn_deployer.activate()
port_services = [
(["master", "smtpd"], 25),
("unbound", 53),
("acmetool", 80),
(["imap-login", "dovecot"], 143),
("nginx", 443),
(["master", "smtpd"], 465),
(["master", "smtpd"], 587),
(["imap-login", "dovecot"], 993),
("iroh-relay", 3340),
("nginx", 8443),
(["master", "smtpd"], config.postfix_reinject_port),
(["master", "smtpd"], config.postfix_reinject_port_incoming),
("filtermail", config.filtermail_smtp_port),
("filtermail", config.filtermail_smtp_port_incoming),
]
for service, port in port_services:
print(f"Checking if port {port} is available for {service}...")
running_service = host.get_fact(Port, port=port)
if running_service:
if running_service not in service:
Out().red(
f"Deploy failed: port {port} is occupied by: {running_service}"
)
exit(1)
unbound_deployer.install()
unbound_deployer.configure()
unbound_deployer.activate()
iroh_deployer.install()
iroh_deployer.configure()
iroh_deployer.activate()
acmetool_deployer.install()
acmetool_deployer.configure()
acmetool_deployer.activate()
echobot_deployer.install()
website_deployer.install()
chatmail_venv_deployer.install()
mtasts_deployer.install()
opendkim_deployer.install()
postfix_deployer.install()
dovecot_deployer.install()
postfix_deployer.install()
nginx_deployer.install()
journald_deployer.install()
rspamd_deployer.install()
fcgiwrap_deployer.install()
echobot_deployer.install()
journald_deployer.install()
mtail_deployer.install()
website_deployer.install()
chatmail_deployer.configure()
turn_deployer.configure()
unbound_deployer.configure()
iroh_deployer.configure()
acmetool_deployer.configure()
website_deployer.configure()
chatmail_venv_deployer.install()
chatmail_venv_deployer.configure()
chatmail_venv_deployer.activate()
mtasts_deployer.configure()
opendkim_deployer.configure()
dovecot_deployer.configure()
postfix_deployer.configure()
nginx_deployer.configure()
mtasts_deployer.configure()
mtasts_deployer.activate()
rspamd_deployer.install()
rspamd_deployer.configure()
fcgiwrap_deployer.configure()
opendkim_deployer.configure()
opendkim_deployer.activate()
echobot_deployer.configure()
journald_deployer.configure()
mtail_deployer.configure()
chatmail_deployer.activate()
turn_deployer.activate()
unbound_deployer.activate()
iroh_deployer.activate()
acmetool_deployer.activate()
website_deployer.activate()
chatmail_venv_deployer.activate()
mtasts_deployer.activate()
opendkim_deployer.activate()
dovecot_deployer.activate()
postfix_deployer.activate()
nginx_deployer.activate()
rspamd_deployer.activate()
fcgiwrap_deployer.activate()
echobot_deployer.activate()
chatmail_deployer.configure()
chatmail_deployer.activate()
journald_deployer.configure()
journald_deployer.activate()
mtail_deployer.activate()
files.directory(
name="Ensure old logs on disk are deleted",
@@ -1284,7 +1277,3 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
dest="/etc/chatmail-version",
mode="700",
)
mtail_deployer.install()
mtail_deployer.configure()
mtail_deployer.activate()