From 0a6db5161d6342775ff729e6e92c1498628351ca Mon Sep 17 00:00:00 2001 From: link2xt Date: Fri, 12 Jan 2024 19:05:23 +0000 Subject: [PATCH] Remove unused _configure_opendkim --- cmdeploy/src/cmdeploy/__init__.py | 77 ------------------------------- 1 file changed, 77 deletions(-) diff --git a/cmdeploy/src/cmdeploy/__init__.py b/cmdeploy/src/cmdeploy/__init__.py index f8342547..96328e4e 100644 --- a/cmdeploy/src/cmdeploy/__init__.py +++ b/cmdeploy/src/cmdeploy/__init__.py @@ -126,83 +126,6 @@ def _install_remote_venv_with_chatmaild(config) -> None: ) -def _configure_opendkim(domain: str, dkim_selector: str = "dkim") -> bool: - """Configures OpenDKIM""" - need_restart = False - - server.group(name="Create opendkim group", group="opendkim", system=True) - server.user( - name="Add postfix user to opendkim group for socket access", - user="postfix", - groups=["opendkim"], - system=True, - ) - - apt.packages( - name="apt install opendkim opendkim-tools", - packages=["opendkim", "opendkim-tools"], - ) - - main_config = files.template( - src=importlib.resources.files(__package__).joinpath("opendkim/opendkim.conf"), - dest="/etc/opendkim.conf", - user="root", - group="root", - mode="644", - config={"domain_name": domain, "opendkim_selector": dkim_selector}, - ) - need_restart |= main_config.changed - - files.directory( - name="Add opendkim directory to /etc", - path="/etc/opendkim", - user="opendkim", - group="opendkim", - mode="750", - present=True, - ) - - keytable = files.template( - src=importlib.resources.files(__package__).joinpath("opendkim/KeyTable"), - dest="/etc/dkimkeys/KeyTable", - user="opendkim", - group="opendkim", - mode="644", - config={"domain_name": domain, "opendkim_selector": dkim_selector}, - ) - need_restart |= keytable.changed - - signing_table = files.template( - src=importlib.resources.files(__package__).joinpath("opendkim/SigningTable"), - dest="/etc/dkimkeys/SigningTable", - user="opendkim", - group="opendkim", - mode="644", - config={"domain_name": domain, "opendkim_selector": dkim_selector}, - ) - need_restart |= signing_table.changed - files.directory( - name="Add opendkim socket directory to /var/spool/postfix", - path="/var/spool/postfix/opendkim", - user="opendkim", - group="opendkim", - mode="750", - present=True, - ) - - if not host.get_fact(File, f"/etc/dkimkeys/{dkim_selector}.private"): - server.shell( - name="Generate OpenDKIM domain keys", - commands=[ - f"opendkim-genkey -D /etc/dkimkeys -d {domain} -s {dkim_selector}" - ], - _sudo=True, - _sudo_user="opendkim", - ) - - return need_restart - - def _install_mta_sts_daemon() -> bool: need_restart = False