diff --git a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf index 81bcec7..f974b4b 100644 --- a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf +++ b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf @@ -31,7 +31,7 @@ # # The level below is what should be used with new (not upgrade) installs. # -compatibility_level = 3.7 +compatibility_level = 3.9 # SOFT BOUNCE # @@ -456,7 +456,7 @@ alias_database = hash:/etc/aliases # The mailbox_command parameter specifies the optional external # command to use instead of mailbox delivery. The command is run as # the recipient with proper HOME, SHELL and LOGNAME environment settings. -# Exception: delivery for root is done as $default_user. +# Exception: delivery for root is done as $default_privs. # # Other environment variables of interest: USER (recipient username), # EXTENSION (address extension), DOMAIN (domain part of address), @@ -673,7 +673,7 @@ debugger_command = # sendmail_path: The full pathname of the Postfix sendmail command. # This is the Sendmail-compatible mail posting interface. # -sendmail_path = /usr/sbin/sendmail.postfix +sendmail_path = /usr/bin/sendmail.postfix # newaliases_path: The full pathname of the Postfix newaliases command. # This is the Sendmail-compatible command to build alias databases. diff --git a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf.proto b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf.proto index 112c1f1..5ad8343 100644 --- a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf.proto +++ b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf.proto @@ -31,7 +31,7 @@ # # The level below is what should be used with new (not upgrade) installs. # -compatibility_level = 3.7 +compatibility_level = 3.9 # SOFT BOUNCE # @@ -456,7 +456,7 @@ alias_database = hash:/etc/aliases # The mailbox_command parameter specifies the optional external # command to use instead of mailbox delivery. The command is run as # the recipient with proper HOME, SHELL and LOGNAME environment settings. -# Exception: delivery for root is done as $default_user. +# Exception: delivery for root is done as $default_privs. # # Other environment variables of interest: USER (recipient username), # EXTENSION (address extension), DOMAIN (domain part of address), diff --git a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf index bb0eae9..c9a55c9 100644 --- a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf +++ b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf @@ -21,6 +21,7 @@ smtp inet n - n - - smtpd # -o smtpd_tls_security_level=encrypt # -o smtpd_sasl_auth_enable=yes # -o smtpd_tls_auth_only=yes +# -o local_header_rewrite_clients=static:all # -o smtpd_reject_unlisted_recipient=no # Instead of specifying complex smtpd__restrictions here, # specify "smtpd__restrictions=$mua__restrictions" @@ -38,6 +39,7 @@ smtp inet n - n - - smtpd # -o syslog_name=postfix/submissions # -o smtpd_tls_wrappermode=yes # -o smtpd_sasl_auth_enable=yes +# -o local_header_rewrite_clients=static:all # -o smtpd_reject_unlisted_recipient=no # Instead of specifying complex smtpd__restrictions here, # specify "smtpd__restrictions=$mua__restrictions" @@ -65,7 +67,7 @@ proxymap unix - - n - - proxymap proxywrite unix - - n - 1 proxymap smtp unix - - n - - smtp relay unix - - n - - smtp - -o syslog_name=postfix/$service_name + -o syslog_name=${multi_instance_name?{$multi_instance_name}:{postfix}}/$service_name # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 showq unix n - n - - showq error unix - - n - - error diff --git a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf.proto b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf.proto index bb0eae9..c9a55c9 100644 --- a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf.proto +++ b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf.proto @@ -21,6 +21,7 @@ smtp inet n - n - - smtpd # -o smtpd_tls_security_level=encrypt # -o smtpd_sasl_auth_enable=yes # -o smtpd_tls_auth_only=yes +# -o local_header_rewrite_clients=static:all # -o smtpd_reject_unlisted_recipient=no # Instead of specifying complex smtpd__restrictions here, # specify "smtpd__restrictions=$mua__restrictions" @@ -38,6 +39,7 @@ smtp inet n - n - - smtpd # -o syslog_name=postfix/submissions # -o smtpd_tls_wrappermode=yes # -o smtpd_sasl_auth_enable=yes +# -o local_header_rewrite_clients=static:all # -o smtpd_reject_unlisted_recipient=no # Instead of specifying complex smtpd__restrictions here, # specify "smtpd__restrictions=$mua__restrictions" @@ -65,7 +67,7 @@ proxymap unix - - n - - proxymap proxywrite unix - - n - 1 proxymap smtp unix - - n - - smtp relay unix - - n - - smtp - -o syslog_name=postfix/$service_name + -o syslog_name=${multi_instance_name?{$multi_instance_name}:{postfix}}/$service_name # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5 showq unix n - n - - showq error unix - - n - - error diff --git a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/virtual b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/virtual index 96390fe..8200ca4 100644 --- a/roles/ensure_postfix/templates/Fedora/42/etc/postfix/virtual +++ b/roles/ensure_postfix/templates/Fedora/42/etc/postfix/virtual @@ -11,12 +11,16 @@ # postmap -q - /etc/postfix/virtual