From 953e1919cbd33eed521d4d231b229222676a6df8 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 22 Nov 2021 16:53:15 +0100 Subject: [PATCH] debug smtpd --- rootfs/etc/confd/templates/main.cf.tmpl | 4 ---- rootfs/etc/confd/templates/master.cf.tmpl | 3 --- 2 files changed, 7 deletions(-) diff --git a/rootfs/etc/confd/templates/main.cf.tmpl b/rootfs/etc/confd/templates/main.cf.tmpl index a41b77d..2a10b6a 100644 --- a/rootfs/etc/confd/templates/main.cf.tmpl +++ b/rootfs/etc/confd/templates/main.cf.tmpl @@ -59,10 +59,6 @@ smtpd_sasl_tls_security_options = noanonymous smtpd_relay_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination smtpd_recipient_restrictions = permit_mynetworks, permit_sasl_authenticated, defer_unauth_destination, reject_unverified_recipient -#smtpd_milters={{ getenv "RSPAMD_ADDRESS" "inet:127.0.0.1:11332" }} -#non_smtpd_milters=$smtpd_milters -milter_mail_macros="i {mail_addr} {client_addr} {client_name} {auth_authen}" - milter_default_action = accept milter_macro_daemon_name = ORIGINATING milter_connect_macros = "i j {daemon_name} v {if_name} _" diff --git a/rootfs/etc/confd/templates/master.cf.tmpl b/rootfs/etc/confd/templates/master.cf.tmpl index 87acb34..0baa643 100644 --- a/rootfs/etc/confd/templates/master.cf.tmpl +++ b/rootfs/etc/confd/templates/master.cf.tmpl @@ -4,9 +4,6 @@ submission inet n - - - - smtpd -o smtpd_sasl_auth_enable=yes -o smtpd_tls_auth_only=yes -o smtpd_reject_unlisted_recipient=no - -o smtpd_client_restrictions=$mua_client_restrictions - -o smtpd_helo_restrictions=$mua_helo_restrictions - -o smtpd_sender_restrictions=$mua_sender_restrictions -o smtpd_recipient_restrictions= -o smtpd_relay_restrictions=permit_sasl_authenticated,reject -o milter_macro_daemon_name=ORIGINATING