AnsiblePlaybooks/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce noise in apply by basing main.cf and master.cf on the version from Fedora 42 for Fedora 42.

Browse Source
This commit is contained in:
jmrothst
2026-08-05 21:31:30 -05:00
parent 08eb9f3479
commit fe09c7c25b
5 changed files with 38 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf
+3 -3
View File
@@ -31,7 +31,7 @@
# #
# The level below is what should be used with new (not upgrade) installs. # The level below is what should be used with new (not upgrade) installs.
# #
compatibility_level = 3.7 compatibility_level = 3.9
# SOFT BOUNCE # SOFT BOUNCE
# #
@@ -456,7 +456,7 @@ alias_database = hash:/etc/aliases
# The mailbox_command parameter specifies the optional external # The mailbox_command parameter specifies the optional external
# command to use instead of mailbox delivery. The command is run as # command to use instead of mailbox delivery. The command is run as
# the recipient with proper HOME, SHELL and LOGNAME environment settings. # 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), # Other environment variables of interest: USER (recipient username),
# EXTENSION (address extension), DOMAIN (domain part of address), # EXTENSION (address extension), DOMAIN (domain part of address),
@@ -673,7 +673,7 @@ debugger_command =
# sendmail_path: The full pathname of the Postfix sendmail command. # sendmail_path: The full pathname of the Postfix sendmail command.
# This is the Sendmail-compatible mail posting interface. # 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. # newaliases_path: The full pathname of the Postfix newaliases command.
# This is the Sendmail-compatible command to build alias databases. # This is the Sendmail-compatible command to build alias databases.
roles/ensure_postfix/templates/Fedora/42/etc/postfix/main.cf.proto
+2 -2
View File
@@ -31,7 +31,7 @@
# #
# The level below is what should be used with new (not upgrade) installs. # The level below is what should be used with new (not upgrade) installs.
# #
compatibility_level = 3.7 compatibility_level = 3.9
# SOFT BOUNCE # SOFT BOUNCE
# #
@@ -456,7 +456,7 @@ alias_database = hash:/etc/aliases
# The mailbox_command parameter specifies the optional external # The mailbox_command parameter specifies the optional external
# command to use instead of mailbox delivery. The command is run as # command to use instead of mailbox delivery. The command is run as
# the recipient with proper HOME, SHELL and LOGNAME environment settings. # 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), # Other environment variables of interest: USER (recipient username),
# EXTENSION (address extension), DOMAIN (domain part of address), # EXTENSION (address extension), DOMAIN (domain part of address),
roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf
+3 -1
View File
@@ -21,6 +21,7 @@ smtp inet n - n - - smtpd
# -o smtpd_tls_security_level=encrypt # -o smtpd_tls_security_level=encrypt
# -o smtpd_sasl_auth_enable=yes # -o smtpd_sasl_auth_enable=yes
# -o smtpd_tls_auth_only=yes # -o smtpd_tls_auth_only=yes
# -o local_header_rewrite_clients=static:all
# -o smtpd_reject_unlisted_recipient=no # -o smtpd_reject_unlisted_recipient=no
# Instead of specifying complex smtpd_<xxx>_restrictions here, # Instead of specifying complex smtpd_<xxx>_restrictions here,
# specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions" # specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions"
@@ -38,6 +39,7 @@ smtp inet n - n - - smtpd
# -o syslog_name=postfix/submissions # -o syslog_name=postfix/submissions
# -o smtpd_tls_wrappermode=yes # -o smtpd_tls_wrappermode=yes
# -o smtpd_sasl_auth_enable=yes # -o smtpd_sasl_auth_enable=yes
# -o local_header_rewrite_clients=static:all
# -o smtpd_reject_unlisted_recipient=no # -o smtpd_reject_unlisted_recipient=no
# Instead of specifying complex smtpd_<xxx>_restrictions here, # Instead of specifying complex smtpd_<xxx>_restrictions here,
# specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions" # specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions"
@@ -65,7 +67,7 @@ proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap proxywrite unix - - n - 1 proxymap
smtp unix - - n - - smtp smtp unix - - n - - smtp
relay 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 # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
showq unix n - n - - showq showq unix n - n - - showq
error unix - - n - - error error unix - - n - - error
roles/ensure_postfix/templates/Fedora/42/etc/postfix/master.cf.proto
+3 -1
View File
@@ -21,6 +21,7 @@ smtp inet n - n - - smtpd
# -o smtpd_tls_security_level=encrypt # -o smtpd_tls_security_level=encrypt
# -o smtpd_sasl_auth_enable=yes # -o smtpd_sasl_auth_enable=yes
# -o smtpd_tls_auth_only=yes # -o smtpd_tls_auth_only=yes
# -o local_header_rewrite_clients=static:all
# -o smtpd_reject_unlisted_recipient=no # -o smtpd_reject_unlisted_recipient=no
# Instead of specifying complex smtpd_<xxx>_restrictions here, # Instead of specifying complex smtpd_<xxx>_restrictions here,
# specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions" # specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions"
@@ -38,6 +39,7 @@ smtp inet n - n - - smtpd
# -o syslog_name=postfix/submissions # -o syslog_name=postfix/submissions
# -o smtpd_tls_wrappermode=yes # -o smtpd_tls_wrappermode=yes
# -o smtpd_sasl_auth_enable=yes # -o smtpd_sasl_auth_enable=yes
# -o local_header_rewrite_clients=static:all
# -o smtpd_reject_unlisted_recipient=no # -o smtpd_reject_unlisted_recipient=no
# Instead of specifying complex smtpd_<xxx>_restrictions here, # Instead of specifying complex smtpd_<xxx>_restrictions here,
# specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions" # specify "smtpd_<xxx>_restrictions=$mua_<xxx>_restrictions"
@@ -65,7 +67,7 @@ proxymap unix - - n - - proxymap
proxywrite unix - - n - 1 proxymap proxywrite unix - - n - 1 proxymap
smtp unix - - n - - smtp smtp unix - - n - - smtp
relay 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 # -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
showq unix n - n - - showq showq unix n - n - - showq
error unix - - n - - error error unix - - n - - error
roles/ensure_postfix/templates/Fedora/42/etc/postfix/virtual
+19 -14
View File
@@ -11,12 +11,16 @@
# postmap -q - /etc/postfix/virtual <inputfile # postmap -q - /etc/postfix/virtual <inputfile
# #
# DESCRIPTION # DESCRIPTION
# The optional virtual(5) alias table rewrites recipient # The optional virtual(5) alias table (virtual_alias_maps)
# addresses for all local, all virtual, and all remote mail # applies to all recipients: local(8), virtual, and remote.
# destinations. This is unlike the aliases(5) table which # This feature is implemented in the Postfix cleanup(8) dae-
# is used only for local(8) delivery. Virtual aliasing is # mon before mail is queued.
# recursive, and is implemented by the Postfix cleanup(8) #
# daemon before mail is queued. # This is unlike the aliases(5) table (alias_maps) which
# applies only to local(8) recipients.
#
# Virtual aliasing is recursive; to terminate recursion for
# a specific address, alias that address to itself.
# #
# The main applications of virtual aliasing are: # The main applications of virtual aliasing are:
# #
@@ -252,9 +256,10 @@
# command after a configuration change. # command after a configuration change.
# #
# virtual_alias_maps ($virtual_maps) # virtual_alias_maps ($virtual_maps)
# Optional lookup tables that alias specific mail # Optional lookup tables with aliases that apply to
# addresses or domains to other local or remote # all recipients: local(8), virtual, and remote; this
# addresses. # is unlike alias_maps that apply only to local(8)
# recipients.
# #
# virtual_alias_domains ($virtual_alias_maps) # virtual_alias_domains ($virtual_alias_maps)
# Postfix is the final destination for the specified # Postfix is the final destination for the specified
@@ -269,8 +274,8 @@
# Other parameters of interest: # Other parameters of interest:
# #
# inet_interfaces (all) # inet_interfaces (all)
# The network interface addresses that this mail sys- # The local network interface addresses that this
# tem receives mail on. # mail system receives mail on.
# #
# mydestination ($myhostname, localhost.$mydomain, local- # mydestination ($myhostname, localhost.$mydomain, local-
# host) # host)
@@ -289,9 +294,9 @@
# the recipient_delimiter is set to "-". # the recipient_delimiter is set to "-".
# #
# proxy_interfaces (empty) # proxy_interfaces (empty)
# The network interface addresses that this mail sys- # The remote network interface addresses that this
# tem receives mail on by way of a proxy or network # mail system receives mail on by way of a proxy or
# address translation unit. # network address translation unit.
# #
# SEE ALSO # SEE ALSO
# cleanup(8), canonicalize and enqueue mail # cleanup(8), canonicalize and enqueue mail