From 4ce36e71bbd625981e578e4922a0725d77e9bad2 Mon Sep 17 00:00:00 2001 From: Julian Rother Date: Mon, 13 Jan 2025 18:40:05 +0100 Subject: [PATCH] Add postfix.enable_submissions option --- defaults/main.yml | 1 + templates/master.cf.j2 | 24 +++++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index cecf1d4..da00e41 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -6,6 +6,7 @@ postfix: incoming_security_level: may enable_opendkim: false enable_submission: false + enable_submissions: false message_size_limit: 20480000 relay_transport: smtp relayhost: '' diff --git a/templates/master.cf.j2 b/templates/master.cf.j2 index 999f656..eb2ff83 100644 --- a/templates/master.cf.j2 +++ b/templates/master.cf.j2 @@ -27,17 +27,19 @@ submission inet n - y - - smtpd -o smtpd_recipient_restrictions= -o milter_macro_daemon_name=ORIGINATING {% endif %} -#smtps inet n - y - - smtpd -# -o syslog_name=postfix/smtps -# -o smtpd_tls_wrappermode=yes -# -o smtpd_sasl_auth_enable=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 +{% if postfix.enable_submissions %} +submissions inet n - y - - smtpd + -o syslog_name=postfix/submissions + -o smtpd_tls_wrappermode=yes + -o smtpd_sasl_auth_enable=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 +{% endif %} #628 inet n - y - - qmqpd pickup unix n - y 60 1 pickup cleanup unix n - y - 0 cleanup