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

feat(cmdeploy): guard against non-running systemd

Browse Source 
This enables docker image building without systemd running, which would
make pyinfra SystemdEnabled fail.
This commit is contained in:
j4n
2026-02-13 14:58:27 +01:00
parent c68df8551c
commit fa2827a07e
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmdeploy/src/cmdeploy/basedeploy.py
View File

@@ -5,6 +5,11 @@ import os
from pyinfra.operations import files, server, systemd from pyinfra.operations import files, server, systemd
def has_systemd():
"""Returns False during Docker image builds or any other non-systemd environment."""
return os.path.isdir("/run/systemd/system")
def get_resource(arg, pkg=__package__): def get_resource(arg, pkg=__package__):
return importlib.resources.files(pkg).joinpath(arg) return importlib.resources.files(pkg).joinpath(arg)

5
cmdeploy/src/cmdeploy/deployers.py
View File

@@ -25,6 +25,7 @@ from .basedeploy import (
activate_remote_units, activate_remote_units,
configure_remote_units, configure_remote_units,
get_resource, get_resource,
has_systemd,
) )
from .dovecot.deployer import DovecotDeployer from .dovecot.deployer import DovecotDeployer
from .filtermail.deployer import FiltermailDeployer from .filtermail.deployer import FiltermailDeployer
@@ -65,6 +66,8 @@ def _build_chatmaild(dist_dir) -> None:
def remove_legacy_artifacts(): def remove_legacy_artifacts():
if not has_systemd():
return
# disable legacy doveauth-dictproxy.service # disable legacy doveauth-dictproxy.service
if host.get_fact(SystemdEnabled).get("doveauth-dictproxy.service"): if host.get_fact(SystemdEnabled).get("doveauth-dictproxy.service"):
systemd.service( systemd.service(
@@ -299,7 +302,7 @@ class LegacyRemoveDeployer(Deployer):
present=False, present=False,
) )
# remove echobot if it is still running # remove echobot if it is still running
if host.get_fact(SystemdEnabled).get("echobot.service"): if has_systemd() and host.get_fact(SystemdEnabled).get("echobot.service"):
systemd.service( systemd.service(
name="Disable echobot.service", name="Disable echobot.service",
service="echobot.service", service="echobot.service",

10
cmdeploy/src/cmdeploy/dovecot/deployer.py
View File

@@ -9,6 +9,7 @@ from cmdeploy.basedeploy import (
activate_remote_units, activate_remote_units,
configure_remote_units, configure_remote_units,
get_resource, get_resource,
has_systemd,
) )
@@ -22,10 +23,11 @@ class DovecotDeployer(Deployer):
def install(self): def install(self):
arch = host.get_fact(Arch) arch = host.get_fact(Arch)
if not "dovecot.service" in host.get_fact(SystemdEnabled): if has_systemd() and "dovecot.service" in host.get_fact(SystemdEnabled):
_install_dovecot_package("core", arch) return # already installed and running
_install_dovecot_package("imapd", arch) _install_dovecot_package("core", arch)
_install_dovecot_package("lmtpd", arch) _install_dovecot_package("imapd", arch)
_install_dovecot_package("lmtpd", arch)
def configure(self): def configure(self):
configure_remote_units(self.config.mail_domain, self.units) configure_remote_units(self.config.mail_domain, self.units)