only do a smtp beforequeue-handler, also simplifies the send-rate-limiting test and improves DC behaviour

This commit is contained in:
holger krekel
2023-10-19 00:54:02 +02:00
parent 10cb099c0e
commit 4358d5fe61
7 changed files with 58 additions and 143 deletions

View File

@@ -34,26 +34,7 @@ def _install_chatmaild() -> None:
commands=[f"pip install --break-system-packages {remote_path}"],
)
files.put(
name="upload doveauth-dictproxy.service",
src=importlib.resources.files("chatmaild")
.joinpath("doveauth-dictproxy.service")
.open("rb"),
dest="/etc/systemd/system/doveauth-dictproxy.service",
user="root",
group="root",
mode="644",
)
systemd.service(
name="Setup doveauth-dictproxy service",
service="doveauth-dictproxy.service",
running=True,
enabled=True,
restarted=True,
daemon_reload=True,
)
for fn in ("filtermail-after", "filtermail-before"):
for fn in ("doveauth-dictproxy", "filtermail-before", ):
files.put(
name=f"upload {fn}.service",
src=importlib.resources.files("chatmaild")

View File

@@ -77,7 +77,5 @@ scache unix - - y - 1 scache
postlog unix-dgram n - n - 1 postlogd
filter unix - n n - - lmtp
# Local SMTP server for reinjecting filered mail.
localhost:10026 inet n - n - 10 smtpd
-o content_filter=filter:unix:private/filtermail-afterqueue
localhost:10027 inet n - n - 10 smtpd
localhost:10025 inet n - n - 10 smtpd
-o content_filter=