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

Remove MTA-STS daemon

Browse Source
This commit is contained in:
link2xt
2025-02-16 15:43:17 +00:00
committed by l
parent 49907c78a3
commit 667a987dfc
2 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,42 +224,21 @@ def _configure_opendkim(domain: str, dkim_selector: str = "dkim") -> bool:
return need_restart return need_restart
def _install_mta_sts_daemon() -> bool: def _uninstall_mta_sts_daemon() -> None:
need_restart = False # Remove configuration.
files.file("/etc/mta-sts-daemon.yml", present=False)
config = files.put( files.directory("/usr/local/lib/postfix-mta-sts-resolver", present=False)
name="upload postfix-mta-sts-resolver config",
src=importlib.resources.files(__package__).joinpath( files.file("/etc/systemd/system/mta-sts-daemon.service", present=False)
"postfix/mta-sts-daemon.yml"
), systemd.service(
dest="/etc/mta-sts-daemon.yml", name="Stop MTA-STS daemon",
user="root", service="mta-sts-daemon.service",
group="root", daemon_reload=True,
mode="644", running=False,
enabled=False,
) )
need_restart |= config.changed
server.shell(
name="install postfix-mta-sts-resolver with pip",
commands=[
"python3 -m virtualenv /usr/local/lib/postfix-mta-sts-resolver",
"/usr/local/lib/postfix-mta-sts-resolver/bin/pip install postfix-mta-sts-resolver",
],
)
systemd_unit = files.put(
name="upload mta-sts-daemon systemd unit",
src=importlib.resources.files(__package__).joinpath(
"postfix/mta-sts-daemon.service"
),
dest="/etc/systemd/system/mta-sts-daemon.service",
user="root",
group="root",
mode="644",
)
need_restart |= systemd_unit.changed
return need_restart
def _configure_postfix(config: Config, debug: bool = False) -> bool: def _configure_postfix(config: Config, debug: bool = False) -> bool:
@@ -663,8 +642,8 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
debug = False debug = False
dovecot_need_restart = _configure_dovecot(config, debug=debug) dovecot_need_restart = _configure_dovecot(config, debug=debug)
postfix_need_restart = _configure_postfix(config, debug=debug) postfix_need_restart = _configure_postfix(config, debug=debug)
mta_sts_need_restart = _install_mta_sts_daemon()
nginx_need_restart = _configure_nginx(config) nginx_need_restart = _configure_nginx(config)
_uninstall_mta_sts_daemon()
_remove_rspamd() _remove_rspamd()
opendkim_need_restart = _configure_opendkim(mail_domain, "opendkim") opendkim_need_restart = _configure_opendkim(mail_domain, "opendkim")
@@ -677,15 +656,6 @@ def deploy_chatmail(config_path: Path, disable_mail: bool) -> None:
restarted=opendkim_need_restart, restarted=opendkim_need_restart,
) )
systemd.service(
name="Start and enable MTA-STS daemon",
service="mta-sts-daemon.service",
daemon_reload=True,
running=True,
enabled=True,
restarted=mta_sts_need_restart,
)
# Dovecot should be started before Postfix # Dovecot should be started before Postfix
# because it creates authentication socket # because it creates authentication socket
# required by Postfix. # required by Postfix.

4
cmdeploy/src/cmdeploy/postfix/main.cf.j2
View File

@@ -20,9 +20,9 @@ smtpd_tls_key_file=/var/lib/acme/live/{{ config.mail_domain }}/privkey
smtpd_tls_security_level=may smtpd_tls_security_level=may
smtp_tls_CApath=/etc/ssl/certs smtp_tls_CApath=/etc/ssl/certs
smtp_tls_security_level=may smtp_tls_security_level=verify
smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
smtp_tls_policy_maps = socketmap:inet:127.0.0.1:8461:postfix smtp_tls_policy_maps = inline:{nauta.cu=may}
smtpd_tls_protocols = >=TLSv1.2 smtpd_tls_protocols = >=TLSv1.2
# Disable anonymous cipher suites # Disable anonymous cipher suites