diff --git a/templates/Fedora/38/etc/postfix/access b/templates/Fedora/38/etc/postfix/access index 257339b..97892eb 100644 --- a/templates/Fedora/38/etc/postfix/access +++ b/templates/Fedora/38/etc/postfix/access @@ -31,7 +31,7 @@ # # Alternatively, the table can be provided as a regu- # lar-expression map where patterns are given as regular -# expressions, or lookups can be directed to TCP-based +# expressions, or lookups can be directed to a TCP-based # server. In those cases, the lookups are done in a slightly # different way as described below under "REGULAR EXPRESSION # TABLES" or "TCP-BASED TABLES". @@ -232,7 +232,7 @@ # # DEFER_IF_PERMIT optional text... # Defer the request if some later restriction would -# result in a an explicit or implicit PERMIT action. +# result in an explicit or implicit PERMIT action. # Reply with "$access_map_defer_code 4.7.1 optional # text..." when the optional text is specified, oth- # erwise reply with a generic error response message. diff --git a/templates/Fedora/38/etc/postfix/canonical b/templates/Fedora/38/etc/postfix/canonical index 9881f4e..4957fcc 100644 --- a/templates/Fedora/38/etc/postfix/canonical +++ b/templates/Fedora/38/etc/postfix/canonical @@ -29,7 +29,7 @@ # # Alternatively, the table can be provided as a regu- # lar-expression map where patterns are given as regular -# expressions, or lookups can be directed to TCP-based +# expressions, or lookups can be directed to a TCP-based # server. In those cases, the lookups are done in a slightly # different way as described below under "REGULAR EXPRESSION # TABLES" or "TCP-BASED TABLES". @@ -252,8 +252,8 @@ # # masquerade_exceptions (empty) # Optional list of user names that are not subjected -# to address masquerading, even when their address -# matches $masquerade_domains. +# to address masquerading, even when their addresses +# match $masquerade_domains. # # mydestination ($myhostname, localhost.$mydomain, local- # host) diff --git a/templates/Fedora/38/etc/postfix/generic b/templates/Fedora/38/etc/postfix/generic index 9d29368..f371eb9 100644 --- a/templates/Fedora/38/etc/postfix/generic +++ b/templates/Fedora/38/etc/postfix/generic @@ -42,8 +42,8 @@ # # Alternatively, the table can be provided as a regu- # lar-expression map where patterns are given as regular -# expressions, or lookups can be directed to TCP-based -# server. In those case, the lookups are done in a slightly +# expressions, or lookups can be directed to a TCP-based +# server. In those cases, the lookups are done in a slightly # different way as described below under "REGULAR EXPRESSION # TABLES" or "TCP-BASED TABLES". # @@ -140,8 +140,8 @@ # This section describes how the table lookups change when # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- -# ble(5). This feature is not available up to and including -# Postfix version 2.4. +# ble(5). This feature is available in Postfix 2.5 and +# later. # # Each lookup operation uses the entire address once. Thus, # user@domain mail addresses are not broken up into their @@ -180,40 +180,42 @@ # The text below provides only a parameter summary. See # postconf(5) for more details including examples. # -# smtp_generic_maps -# Address mapping lookup table for envelope and -# header sender and recipient addresses while deliv- -# ering mail via SMTP. +# smtp_generic_maps (empty) +# Optional lookup tables that perform address rewrit- +# ing in the Postfix SMTP client, typically to trans- +# form a locally valid address into a globally valid +# address when sending mail across the Internet. # -# propagate_unmatched_extensions -# A list of address rewriting or forwarding mecha- -# nisms that propagate an address extension from the -# original address to the result. Specify zero or -# more of canonical, virtual, alias, forward, -# include, or generic. +# propagate_unmatched_extensions (canonical, virtual) +# What address lookup tables copy an address exten- +# sion from the lookup key to the lookup result. # # Other parameters of interest: # -# inet_interfaces -# The network interface addresses that this system -# receives mail on. You need to stop and start Post- -# fix when this parameter changes. +# inet_interfaces (all) +# The network interface addresses that this mail sys- +# tem receives mail on. # -# proxy_interfaces -# Other interfaces that this machine receives mail on -# by way of a proxy agent or network address transla- -# tor. +# proxy_interfaces (empty) +# The network interface addresses that this mail sys- +# tem receives mail on by way of a proxy or network +# address translation unit. # -# mydestination -# List of domains that this mail system considers -# local. +# mydestination ($myhostname, localhost.$mydomain, local- +# host) +# The list of domains that are delivered via the +# $local_transport mail delivery transport. # -# myorigin -# The domain that is appended to locally-posted mail. +# myorigin ($myhostname) +# The domain name that locally-posted mail appears to +# come from, and that locally posted mail is deliv- +# ered to. # -# owner_request_special -# Give special treatment to owner-xxx and xxx-request -# addresses. +# owner_request_special (yes) +# Enable special treatment for owner-listname entries +# in the aliases(5) file, and don't split owner-list- +# name and listname-request address localparts when +# the recipient_delimiter is set to "-". # # SEE ALSO # postmap(1), Postfix lookup table manager diff --git a/templates/Fedora/38/etc/postfix/main.cf b/templates/Fedora/38/etc/postfix/main.cf index e26183d..98f02e6 100644 --- a/templates/Fedora/38/etc/postfix/main.cf +++ b/templates/Fedora/38/etc/postfix/main.cf @@ -2,6 +2,10 @@ # of all parameters. For the syntax, and for a complete parameter # list, see the postconf(5) manual page (command: "man 5 postconf"). # +# TIP: use the command "postconf -n" to view main.cf parameter +# settings, "postconf parametername" to view a specific parameter, +# and "postconf 'parametername=value'" to set a specific parameter. +# # For common configuration examples, see BASIC_CONFIGURATION_README # and STANDARD_CONFIGURATION_README. To find these documents, use # the command "postconf html_directory readme_directory", or go to @@ -27,7 +31,7 @@ # # The level below is what should be used with new (not upgrade) installs. # -compatibility_level = 3.6 +compatibility_level = 3.7 # SOFT BOUNCE # @@ -251,11 +255,14 @@ unknown_local_recipient_reject_code = 550 # You can specify the list of "trusted" network addresses by hand # or you can let Postfix do it for you (which is the default). # -# By default (mynetworks_style = subnet), Postfix "trusts" SMTP -# clients in the same IP subnetworks as the local machine. -# On Linux, this works correctly only with interfaces specified -# with the "ifconfig" command. +# By default (mynetworks_style = host), Postfix "trusts" only +# the local machine. # +# Specify "mynetworks_style = subnet" when Postfix should "trust" +# SMTP clients in the same IP subnetworks as the local machine. +# On Linux, this works correctly only with interfaces specified +# with the "ifconfig" or "ip" command. +# # Specify "mynetworks_style = class" when Postfix should "trust" SMTP # clients in the same IP class A/B/C networks as the local machine. # Don't do this with a dialup site - it would cause Postfix to "trust" @@ -285,14 +292,16 @@ unknown_local_recipient_reject_code = 550 #mynetworks = hash:/etc/postfix/network_table # The relay_domains parameter restricts what destinations this system will -# relay mail to. See the smtpd_recipient_restrictions description in -# postconf(5) for detailed information. +# relay mail to. See the smtpd_relay_restrictions and +# smtpd_recipient_restrictions descriptions in postconf(5) for detailed +# information. # # By default, Postfix relays mail -# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "trusted" clients (IP address matches $mynetworks, or is +# SASL authenticated) to any destination, # - from "untrusted" clients to destinations that match $relay_domains or # subdomains thereof, except addresses with sender-specified routing. -# The default relay_domains value is $mydestination. +# The default relay_domains value is empty. # # In addition to the above, the Postfix SMTP server by default accepts mail # that Postfix is final destination for: @@ -312,7 +321,7 @@ unknown_local_recipient_reject_code = 550 # list this system as their primary or backup MX host. See the # permit_mx_backup restriction description in postconf(5). # -#relay_domains = $mydestination +#relay_domains = # INTERNET OR INTRANET @@ -744,9 +753,9 @@ shlib_directory = /usr/lib64/postfix {% if ensure_postfix.milter_list is defined and ensure_postfix.milter_list is iterable %} # The Milter List {% for milter in ensure_postfix.milter_list %} -# -- {{ milter.description }} -- {{ milter.protocol }}:{{ milter.hostname }}:{{ milter.port }} +# -- {{ milter.description }} -- {{ milter.protocol }}:{{ milter.destination }} {% endfor %} -smtpd_milters = {% for milter in ensure_postfix.milter_list %} {{ milter.protocol }}:{{ milter.hostname }}:{{ milter.port }} {% endfor %} +smtpd_milters = {% for milter in ensure_postfix.milter_list %} {{ milter.protocol }}:{{ milter.destination }} {% endfor %} {% endif %} {% if postfix_domains is defined and postfix_domains is iterable %} @@ -763,4 +772,3 @@ message_size_limit = {{ postfix_message_size_limit }} smtpd_helo_restrictions = reject_unknown_helo_hostname smtpd_client_restrictions = reject_unknown_reverse_client_hostname reject_unauth_pipelining smtpd_discard_ehlo_keywords = silent-discard, dsn - diff --git a/templates/Fedora/38/etc/postfix/main.cf.proto b/templates/Fedora/38/etc/postfix/main.cf.proto index 9bef4f2..112c1f1 100644 --- a/templates/Fedora/38/etc/postfix/main.cf.proto +++ b/templates/Fedora/38/etc/postfix/main.cf.proto @@ -2,6 +2,10 @@ # of all parameters. For the syntax, and for a complete parameter # list, see the postconf(5) manual page (command: "man 5 postconf"). # +# TIP: use the command "postconf -n" to view main.cf parameter +# settings, "postconf parametername" to view a specific parameter, +# and "postconf 'parametername=value'" to set a specific parameter. +# # For common configuration examples, see BASIC_CONFIGURATION_README # and STANDARD_CONFIGURATION_README. To find these documents, use # the command "postconf html_directory readme_directory", or go to @@ -27,7 +31,7 @@ # # The level below is what should be used with new (not upgrade) installs. # -compatibility_level = 3.6 +compatibility_level = 3.7 # SOFT BOUNCE # @@ -251,11 +255,14 @@ unknown_local_recipient_reject_code = 550 # You can specify the list of "trusted" network addresses by hand # or you can let Postfix do it for you (which is the default). # -# By default (mynetworks_style = subnet), Postfix "trusts" SMTP -# clients in the same IP subnetworks as the local machine. -# On Linux, this works correctly only with interfaces specified -# with the "ifconfig" command. +# By default (mynetworks_style = host), Postfix "trusts" only +# the local machine. # +# Specify "mynetworks_style = subnet" when Postfix should "trust" +# SMTP clients in the same IP subnetworks as the local machine. +# On Linux, this works correctly only with interfaces specified +# with the "ifconfig" or "ip" command. +# # Specify "mynetworks_style = class" when Postfix should "trust" SMTP # clients in the same IP class A/B/C networks as the local machine. # Don't do this with a dialup site - it would cause Postfix to "trust" @@ -285,14 +292,16 @@ unknown_local_recipient_reject_code = 550 #mynetworks = hash:/etc/postfix/network_table # The relay_domains parameter restricts what destinations this system will -# relay mail to. See the smtpd_recipient_restrictions description in -# postconf(5) for detailed information. +# relay mail to. See the smtpd_relay_restrictions and +# smtpd_recipient_restrictions descriptions in postconf(5) for detailed +# information. # # By default, Postfix relays mail -# - from "trusted" clients (IP address matches $mynetworks) to any destination, +# - from "trusted" clients (IP address matches $mynetworks, or is +# SASL authenticated) to any destination, # - from "untrusted" clients to destinations that match $relay_domains or # subdomains thereof, except addresses with sender-specified routing. -# The default relay_domains value is $mydestination. +# The default relay_domains value is empty. # # In addition to the above, the Postfix SMTP server by default accepts mail # that Postfix is final destination for: @@ -312,7 +321,7 @@ unknown_local_recipient_reject_code = 550 # list this system as their primary or backup MX host. See the # permit_mx_backup restriction description in postconf(5). # -#relay_domains = $mydestination +#relay_domains = # INTERNET OR INTRANET diff --git a/templates/Fedora/38/etc/postfix/master.cf b/templates/Fedora/38/etc/postfix/master.cf index 4beb91f..bb0eae9 100644 --- a/templates/Fedora/38/etc/postfix/master.cf +++ b/templates/Fedora/38/etc/postfix/master.cf @@ -16,30 +16,38 @@ smtp inet n - n - - smtpd #tlsproxy unix - - n - 0 tlsproxy # Choose one: enable submission for loopback clients only, or for any client. #127.0.0.1:submission inet n - n - - smtpd -# submission inet n - n - - smtpd +#submission inet n - n - - smtpd # -o syslog_name=postfix/submission # -o smtpd_tls_security_level=encrypt # -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 +# Instead of specifying complex smtpd__restrictions here, +# specify "smtpd__restrictions=$mua__restrictions" +# here, and specify mua__restrictions in main.cf (where +# "" is "client", "helo", "sender", "relay", or "recipient"). +# -o smtpd_client_restrictions= +# -o smtpd_helo_restrictions= +# -o smtpd_sender_restrictions= +# -o smtpd_relay_restrictions= +# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING -# Choose one: enable smtps for loopback clients only, or for any client. -#127.0.0.1:smtps inet n - n - - smtpd -# smtps inet n - n - - smtpd -# -o syslog_name=postfix/smtps +# Choose one: enable submissions for loopback clients only, or for any client. +#127.0.0.1:submissions inet n - n - - smtpd +#submissions inet n - n - - 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 +# Instead of specifying complex smtpd__restrictions here, +# specify "smtpd__restrictions=$mua__restrictions" +# here, and specify mua__restrictions in main.cf (where +# "" is "client", "helo", "sender", "relay", or "recipient"). +# -o smtpd_client_restrictions= +# -o smtpd_helo_restrictions= +# -o smtpd_sender_restrictions= +# -o smtpd_relay_restrictions= +# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING #628 inet n - n - - qmqpd pickup unix n - n 60 1 pickup diff --git a/templates/Fedora/38/etc/postfix/master.cf.proto b/templates/Fedora/38/etc/postfix/master.cf.proto index f33d9dd..bb0eae9 100644 --- a/templates/Fedora/38/etc/postfix/master.cf.proto +++ b/templates/Fedora/38/etc/postfix/master.cf.proto @@ -22,24 +22,32 @@ smtp inet n - 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 +# Instead of specifying complex smtpd__restrictions here, +# specify "smtpd__restrictions=$mua__restrictions" +# here, and specify mua__restrictions in main.cf (where +# "" is "client", "helo", "sender", "relay", or "recipient"). +# -o smtpd_client_restrictions= +# -o smtpd_helo_restrictions= +# -o smtpd_sender_restrictions= +# -o smtpd_relay_restrictions= +# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING -# Choose one: enable smtps for loopback clients only, or for any client. -#127.0.0.1:smtps inet n - n - - smtpd -#smtps inet n - n - - smtpd -# -o syslog_name=postfix/smtps +# Choose one: enable submissions for loopback clients only, or for any client. +#127.0.0.1:submissions inet n - n - - smtpd +#submissions inet n - n - - 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 +# Instead of specifying complex smtpd__restrictions here, +# specify "smtpd__restrictions=$mua__restrictions" +# here, and specify mua__restrictions in main.cf (where +# "" is "client", "helo", "sender", "relay", or "recipient"). +# -o smtpd_client_restrictions= +# -o smtpd_helo_restrictions= +# -o smtpd_sender_restrictions= +# -o smtpd_relay_restrictions= +# -o smtpd_recipient_restrictions=permit_sasl_authenticated,reject # -o milter_macro_daemon_name=ORIGINATING #628 inet n - n - - qmqpd pickup unix n - n 60 1 pickup diff --git a/templates/Fedora/38/etc/postfix/postfix-files b/templates/Fedora/38/etc/postfix/postfix-files index 1eda0a3..b3ed234 100644 --- a/templates/Fedora/38/etc/postfix/postfix-files +++ b/templates/Fedora/38/etc/postfix/postfix-files @@ -123,7 +123,7 @@ $command_directory/postconf:f:root:-:755 $command_directory/postfix:f:root:-:755 $command_directory/postkick:f:root:-:755 $command_directory/postlock:f:root:-:755 -$command_directory/postlog:f:root:-:755 +$command_directory/postlog:f:root:$setgid_group:2755:u $command_directory/postmap:f:root:-:755 $command_directory/postmulti:f:root:-:755 $command_directory/postsuper:f:root:-:755 @@ -157,8 +157,8 @@ $manpage_directory/man1/postalias.1.gz:f:root:-:644 $manpage_directory/man1/postcat.1.gz:f:root:-:644 $manpage_directory/man1/postconf.1.gz:f:root:-:644 $manpage_directory/man1/postdrop.1.gz:f:root:-:644 -$manpage_directory/man1/postfix.1.gz:f:root:-:644 $manpage_directory/man1/postfix-tls.1.gz:f:root:-:644 +$manpage_directory/man1/postfix.1.gz:f:root:-:644 $manpage_directory/man1/postkick.1.gz:f:root:-:644 $manpage_directory/man1/postlock.1.gz:f:root:-:644 $manpage_directory/man1/postlog.1.gz:f:root:-:644 @@ -256,6 +256,7 @@ $readme_directory/ADDRESS_REWRITING_README:f:root:-:644 $readme_directory/ADDRESS_VERIFICATION_README:f:root:-:644 $readme_directory/BACKSCATTER_README:f:root:-:644 $readme_directory/BASIC_CONFIGURATION_README:f:root:-:644 +$readme_directory/BDAT_README:f:root:-:644 $readme_directory/BUILTIN_FILTER_README:f:root:-:644 $readme_directory/COMPATIBILITY_README:f:root:-:644 $readme_directory/CONNECTION_CACHE_README:f:root:-:644 @@ -274,12 +275,15 @@ $readme_directory/LINUX_README:f:root:-:644 $readme_directory/LOCAL_RECIPIENT_README:f:root:-:644 $readme_directory/MACOSX_README:f:root:-:644:o $readme_directory/MAILDROP_README:f:root:-:644 +$readme_directory/MAILLOG_README:f:root:-:644 $readme_directory/MEMCACHE_README:f:root:-:644 $readme_directory/MILTER_README:f:root:-:644 $readme_directory/MULTI_INSTANCE_README:f:root:-:644 +$readme_directory/SMTPUTF8_README:f:root:-:644 $readme_directory/NFS_README:f:root:-:644 $readme_directory/OVERVIEW:f:root:-:644 $readme_directory/PACKAGE_README:f:root:-:644 +$readme_directory/POSTSCREEN_3_5_README:f:root:-:644 $readme_directory/POSTSCREEN_README:f:root:-:644 $readme_directory/QMQP_README:f:root:-:644:o $readme_directory/QSHAPE_README:f:root:-:644 @@ -307,6 +311,7 @@ $html_directory/ADDRESS_REWRITING_README.html:f:root:-:644 $html_directory/ADDRESS_VERIFICATION_README.html:f:root:-:644 $html_directory/BACKSCATTER_README.html:f:root:-:644 $html_directory/BASIC_CONFIGURATION_README.html:f:root:-:644 +$html_directory/BDAT_README.html:f:root:-:644 $html_directory/BUILTIN_FILTER_README.html:f:root:-:644 $html_directory/CDB_README.html:f:root:-:644 $html_directory/COMPATIBILITY_README.html:f:root:-:644 @@ -327,15 +332,19 @@ $html_directory/LINUX_README.html:f:root:-:644 $html_directory/LMDB_README.html:f:root:-:644 $html_directory/LOCAL_RECIPIENT_README.html:f:root:-:644 $html_directory/MAILDROP_README.html:f:root:-:644 +$html_directory/MAILLOG_README.html:f:root:-:644 +$html_directory/MEMCACHE_README.html:f:root:-:644 $html_directory/MILTER_README.html:f:root:-:644 $html_directory/MULTI_INSTANCE_README.html:f:root:-:644 $html_directory/MYSQL_README.html:f:root:-:644 +$html_directory/SMTPUTF8_README.html:f:root:-:644 $html_directory/SQLITE_README.html:f:root:-:644 $html_directory/NFS_README.html:f:root:-:644 $html_directory/OVERVIEW.html:f:root:-:644 $html_directory/PACKAGE_README.html:f:root:-:644 $html_directory/PCRE_README.html:f:root:-:644 $html_directory/PGSQL_README.html:f:root:-:644 +$html_directory/POSTSCREEN_3_5_README.html:f:root:-:644 $html_directory/POSTSCREEN_README.html:f:root:-:644 $html_directory/QMQP_README.html:f:root:-:644:o $html_directory/QSHAPE_README.html:f:root:-:644 @@ -360,6 +369,7 @@ $html_directory/XFORWARD_README.html:f:root:-:644 $html_directory/access.5.html:f:root:-:644 $html_directory/aliases.5.html:f:root:-:644 $html_directory/anvil.8.html:f:root:-:644 +$html_directory/bounce.5.html:f:root:-:644 $html_directory/bounce.8.html:f:root:-:644 $html_directory/canonical.5.html:f:root:-:644 $html_directory/cidr_table.5.html:f:root:-:644 @@ -374,6 +384,7 @@ $html_directory/generic.5.html:f:root:-:644 $html_directory/header_checks.5.html:f:root:-:644 $html_directory/index.html:f:root:-:644 $html_directory/ldap_table.5.html:f:root:-:644 +$html_directory/lmdb_table.5.html:f:root:-:644 $html_directory/lmtp.8.html:f:root:-:644 $html_directory/local.8.html:f:root:-:644 $html_directory/mailq.1.html:f:root:-:644 @@ -396,6 +407,7 @@ $html_directory/postconf.5.html:f:root:-:644 $html_directory/postdrop.1.html:f:root:-:644 $html_directory/postfix-logo.jpg:f:root:-:644 $html_directory/postfix-manuals.html:f:root:-:644 +$html_directory/postfix-tls.1.html:f:root:-:644 $html_directory/postfix-wrapper.5.html:f:root:-:644 $html_directory/postfix.1.html:f:root:-:644 $html_directory/postkick.1.html:f:root:-:644 @@ -415,13 +427,16 @@ $html_directory/qmqp-source.1.html:f:root:-:644 $html_directory/qmqpd.8.html:f:root:-:644 $html_directory/regexp_table.5.html:f:root:-:644 $html_directory/relocated.5.html:f:root:-:644 +$html_directory/scache.8.html:f:root:-:644 $html_directory/sendmail.1.html:h:$html_directory/mailq.1.html:-:644 $html_directory/showq.8.html:f:root:-:644 $html_directory/smtp-sink.1.html:f:root:-:644 $html_directory/smtp-source.1.html:f:root:-:644 $html_directory/smtp.8.html:h:$html_directory/lmtp.8.html:-:644 $html_directory/smtpd.8.html:f:root:-:644 +$html_directory/socketmap_table.5.html:f:root:-:644 $html_directory/spawn.8.html:f:root:-:644 +$html_directory/tlsmgr.8.html:f:root:-:644 $html_directory/tlsproxy.8.html:f:root:-:644 $html_directory/tcp_table.5.html:f:root:-:644 $html_directory/trace.8.html:h:$html_directory/bounce.8.html:-:644 diff --git a/templates/Fedora/38/etc/postfix/relocated b/templates/Fedora/38/etc/postfix/relocated index e50edfd..90f63ec 100644 --- a/templates/Fedora/38/etc/postfix/relocated +++ b/templates/Fedora/38/etc/postfix/relocated @@ -24,7 +24,7 @@ # # Alternatively, the table can be provided as a regu- # lar-expression map where patterns are given as regular -# expressions, or lookups can be directed to TCP-based +# expressions, or lookups can be directed to a TCP-based # server. In those case, the lookups are done in a slightly # different way as described below under "REGULAR EXPRESSION # TABLES" or "TCP-BASED TABLES". @@ -86,66 +86,68 @@ # description of regular expression lookup table syntax, see # regexp_table(5) or pcre_table(5). For a description of the # TCP client/server table lookup protocol, see tcp_table(5). -# This feature is not available up to and including Postfix -# version 2.4. +# This feature is available in Postfix 2.5 and later. # -# Each pattern is a regular expression that is applied to +# Each pattern is a regular expression that is applied to # the entire address being looked up. Thus, user@domain mail -# addresses are not broken up into their user and @domain +# addresses are not broken up into their user and @domain # constituent parts, nor is user+foo broken up into user and # foo. # -# Patterns are applied in the order as specified in the ta- -# ble, until a pattern is found that matches the search +# Patterns are applied in the order as specified in the ta- +# ble, until a pattern is found that matches the search # string. # -# Results are the same as with indexed file lookups, with -# the additional feature that parenthesized substrings from +# Results are the same as with indexed file lookups, with +# the additional feature that parenthesized substrings from # the pattern can be interpolated as $1, $2 and so on. # # TCP-BASED TABLES -# This section describes how the table lookups change when +# This section describes how the table lookups change when # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- -# ble(5). This feature is not available up to and including -# Postfix version 2.4. +# ble(5). This feature is available in Postfix 2.5 and +# later. # # Each lookup operation uses the entire address once. Thus, -# user@domain mail addresses are not broken up into their +# user@domain mail addresses are not broken up into their # user and @domain constituent parts, nor is user+foo broken # up into user and foo. # # Results are the same as with indexed file lookups. # # BUGS -# The table format does not understand quoting conventions. +# The table format does not understand quoting conventions. # # CONFIGURATION PARAMETERS -# The following main.cf parameters are especially relevant. -# The text below provides only a parameter summary. See +# The following main.cf parameters are especially relevant. +# The text below provides only a parameter summary. See # postconf(5) for more details including examples. # -# relocated_maps -# List of lookup tables for relocated users or sites. +# relocated_maps (empty) +# Optional lookup tables with new contact information +# for users or domains that no longer exist. # # Other parameters of interest: # -# inet_interfaces -# The network interface addresses that this system -# receives mail on. You need to stop and start Post- -# fix when this parameter changes. +# inet_interfaces (all) +# The network interface addresses that this mail sys- +# tem receives mail on. # -# mydestination -# List of domains that this mail system considers -# local. +# mydestination ($myhostname, localhost.$mydomain, local- +# host) +# The list of domains that are delivered via the +# $local_transport mail delivery transport. # -# myorigin -# The domain that is appended to locally-posted mail. +# myorigin ($myhostname) +# The domain name that locally-posted mail appears to +# come from, and that locally posted mail is deliv- +# ered to. # -# proxy_interfaces -# Other interfaces that this machine receives mail on -# by way of a proxy agent or network address transla- -# tor. +# proxy_interfaces (empty) +# The network interface addresses that this mail sys- +# tem receives mail on by way of a proxy or network +# address translation unit. # # SEE ALSO # trivial-rewrite(8), address resolver @@ -153,13 +155,13 @@ # postconf(5), configuration parameters # # README FILES -# Use "postconf readme_directory" or "postconf html_direc- +# Use "postconf readme_directory" or "postconf html_direc- # tory" to locate this information. # DATABASE_README, Postfix lookup table overview # ADDRESS_REWRITING_README, address rewriting guide # # LICENSE -# The Secure Mailer license must be distributed with this +# The Secure Mailer license must be distributed with this # software. # # AUTHOR(S) diff --git a/templates/Fedora/38/etc/postfix/transport b/templates/Fedora/38/etc/postfix/transport index 1dcd787..bad7739 100644 --- a/templates/Fedora/38/etc/postfix/transport +++ b/templates/Fedora/38/etc/postfix/transport @@ -61,7 +61,7 @@ # # Alternatively, the table can be provided as a regu- # lar-expression map where patterns are given as regular -# expressions, or lookups can be directed to TCP-based +# expressions, or lookups can be directed to a TCP-based # server. In those case, the lookups are done in a slightly # different way as described below under "REGULAR EXPRESSION # TABLES" or "TCP-BASED TABLES". diff --git a/templates/Fedora/38/etc/postfix/virtual b/templates/Fedora/38/etc/postfix/virtual index da9cd65..96390fe 100644 --- a/templates/Fedora/38/etc/postfix/virtual +++ b/templates/Fedora/38/etc/postfix/virtual @@ -51,7 +51,7 @@ # # Alternatively, the table can be provided as a regu- # lar-expression map where patterns are given as regular -# expressions, or lookups can be directed to TCP-based +# expressions, or lookups can be directed to a TCP-based # server. In those case, the lookups are done in a slightly # different way as described below under "REGULAR EXPRESSION # TABLES" or "TCP-BASED TABLES". @@ -99,8 +99,8 @@ # tination, or when it is listed in $inet_interfaces # or $proxy_interfaces. # -# This functionality overlaps with functionality of -# the local aliases(5) database. The difference is +# This functionality overlaps with the functionality +# of the local aliases(5) database. The difference is # that virtual(5) mapping can be applied to non-local # addresses. # @@ -155,7 +155,7 @@ # # The propagate_unmatched_extensions parameter controls # whether an unmatched address extension (+foo) is propa- -# gated to the result of table lookup. +# gated to the result of a table lookup. # # VIRTUAL ALIAS DOMAINS # Besides virtual aliases, the virtual alias table can also @@ -232,8 +232,8 @@ # This section describes how the table lookups change when # lookups are directed to a TCP-based server. For a descrip- # tion of the TCP client/server lookup protocol, see tcp_ta- -# ble(5). This feature is not available up to and including -# Postfix version 2.4. +# ble(5). This feature is available in Postfix 2.5 and +# later. # # Each lookup operation uses the entire address once. Thus, # user@domain mail addresses are not broken up into their @@ -254,11 +254,11 @@ # virtual_alias_maps ($virtual_maps) # Optional lookup tables that alias specific mail # addresses or domains to other local or remote -# address. +# addresses. # # virtual_alias_domains ($virtual_alias_maps) -# Postfix is final destination for the specified list -# of virtual alias domains, that is, domains for +# Postfix is the final destination for the specified +# list of virtual alias domains, that is, domains for # which all addresses are aliased to addresses in # other local or remote domains. # diff --git a/vars/Fedora-38-default.yml b/vars/Fedora-38-default.yml index d2f418d..c5a7a2f 100644 --- a/vars/Fedora-38-default.yml +++ b/vars/Fedora-38-default.yml @@ -2,13 +2,11 @@ # vars file for ensure_postfix milter_list: - description: 'OpenDKIM' - hostname: 'localhost' - port: '8891' - protocol: 'inet' + destination: '/run/opendkim/opendkim.sock' + protocol: 'local' - description: 'OpenDMARC' - hostname: 'localhost' - port: '8893' - protocol: 'inet' + hostname: '/run/opendmarc/opendmarc.sock' + protocol: 'local' package_list: - name: 'opendkim' state: 'present'