144 lines
4.8 KiB
Diff
144 lines
4.8 KiB
Diff
From: Michael Tokarev <mjt@tls.msk.ru>
|
|
Subject: Debian-specific defaults for main.cf and master.cf
|
|
Date: Thu, 19 Dec 2024 22:37:11 +0300
|
|
Forwarded: not-needed
|
|
|
|
Change a few parameters to match Debian defaults.
|
|
|
|
diff --git a/conf/main.cf b/conf/main.cf
|
|
--- a/conf/main.cf
|
|
+++ b/conf/main.cf
|
|
@@ -52,10 +52,10 @@ compatibility_level = 3.9
|
|
# environments on different UNIX systems.
|
|
#
|
|
-queue_directory = /var/spool/postfix
|
|
+#queue_directory = /var/spool/postfix
|
|
|
|
# The command_directory parameter specifies the location of all
|
|
# postXXX commands.
|
|
#
|
|
-command_directory = /usr/sbin
|
|
+#command_directory = /usr/sbin
|
|
|
|
# The daemon_directory parameter specifies the location of all Postfix
|
|
@@ -63,5 +63,5 @@ command_directory = /usr/sbin
|
|
# directory must be owned by root.
|
|
#
|
|
-daemon_directory = /usr/libexec/postfix
|
|
+#daemon_directory = /usr/lib/postfix/sbin
|
|
|
|
# The data_directory parameter specifies the location of Postfix-writable
|
|
@@ -69,5 +69,5 @@ daemon_directory = /usr/libexec/postfix
|
|
# by the mail_owner account (see below).
|
|
#
|
|
-data_directory = /var/lib/postfix
|
|
+#data_directory = /var/lib/postfix
|
|
|
|
# QUEUE AND PROCESS OWNERSHIP
|
|
@@ -80,5 +80,5 @@ data_directory = /var/lib/postfix
|
|
# USER.
|
|
#
|
|
-mail_owner = postfix
|
|
+#mail_owner = postfix
|
|
|
|
# The default_privs parameter specifies the default rights used by
|
|
@@ -89,4 +89,12 @@ mail_owner = postfix
|
|
#default_privs = nobody
|
|
|
|
+# The Internet protocols Postfix will attempt to use when making or
|
|
+# accepting connections. Specify one or more of "ipv4" or "ipv6",
|
|
+# separated by whitespace or commas. The form "all" is equivalent
|
|
+# to "ipv4, ipv6".
|
|
+#
|
|
+#inet_protocools = ipv4
|
|
+inet_protocols = all
|
|
+
|
|
# INTERNET HOST AND DOMAIN NAMES
|
|
#
|
|
@@ -119,4 +127,9 @@ mail_owner = postfix
|
|
# to recipient addresses that have no @domain part.
|
|
#
|
|
+# Debian specific: Specifying a file name here will cause the first
|
|
+# line of that file to be used as the name. The Debian default is
|
|
+# /etc/mailname.
|
|
+#
|
|
+myorigin = /etc/mailname
|
|
#myorigin = $myhostname
|
|
#myorigin = $mydomain
|
|
@@ -469,6 +482,6 @@ unknown_local_recipient_reject_code = 550
|
|
# ALIAS THAT FORWARDS MAIL FOR ROOT TO A REAL USER.
|
|
#
|
|
-#mailbox_command = /some/where/procmail
|
|
-#mailbox_command = /some/where/procmail -a "$EXTENSION"
|
|
+#mailbox_command = /usr/bin/procmail
|
|
+#mailbox_command = /usr/bin/procmail -a "$EXTENSION"
|
|
|
|
# The mailbox_transport specifies the optional transport in master.cf
|
|
@@ -577,4 +590,5 @@ unknown_local_recipient_reject_code = 550
|
|
#smtpd_banner = $myhostname ESMTP $mail_name
|
|
#smtpd_banner = $myhostname ESMTP $mail_name ($mail_version)
|
|
+smtpd_banner = $myhostname ESMTP $mail_name (@DEB_VENDOR@)
|
|
|
|
# PARALLEL DELIVERY TO THE SAME DESTINATION
|
|
@@ -649,15 +663,15 @@ debugger_command =
|
|
# This is the Sendmail-compatible mail posting interface.
|
|
#
|
|
-sendmail_path =
|
|
+#sendmail_path = /usr/sbin/sendmail
|
|
|
|
# newaliases_path: The full pathname of the Postfix newaliases command.
|
|
# This is the Sendmail-compatible command to build alias databases.
|
|
#
|
|
-newaliases_path =
|
|
+#newaliases_path = /usr/bin/newaliases
|
|
|
|
# mailq_path: The full pathname of the Postfix mailq command. This
|
|
# is the Sendmail-compatible mail queue listing command.
|
|
#
|
|
-mailq_path =
|
|
+#mailq_path = /usr/bin/mailq
|
|
|
|
# setgid_group: The group for mail submission and queue management
|
|
@@ -665,21 +679,15 @@ mailq_path =
|
|
# is not shared with other accounts, not even with the Postfix account.
|
|
#
|
|
-setgid_group =
|
|
+#setgid_group = postdrop
|
|
|
|
# html_directory: The location of the Postfix HTML documentation.
|
|
#
|
|
-html_directory =
|
|
+#html_directory = /usr/share/doc/postfix/html
|
|
|
|
# manpage_directory: The location of the Postfix on-line manual pages.
|
|
#
|
|
-manpage_directory =
|
|
-
|
|
-# sample_directory: The location of the Postfix sample configuration files.
|
|
-# This parameter is obsolete as of Postfix 2.1.
|
|
-#
|
|
-sample_directory =
|
|
+#manpage_directory = /usr/share/man
|
|
|
|
# readme_directory: The location of the Postfix README files.
|
|
#
|
|
-readme_directory =
|
|
-inet_protocols = ipv4
|
|
+#readme_directory = /usr/share/doc/postfix
|
|
diff --git a/conf/master.cf b/conf/master.cf
|
|
--- a/conf/master.cf
|
|
+++ b/conf/master.cf
|
|
@@ -94,5 +94,5 @@ postlog unix-dgram n - n - 1 postlogd
|
|
#
|
|
#maildrop unix - n n - - pipe
|
|
-# flags=DRXhu user=vmail argv=/usr/local/bin/maildrop -d ${recipient}
|
|
+# flags=DRXhu user=vmail argv=/usr/bin/maildrop -d ${recipient}
|
|
#
|
|
# ====================================================================
|
|
@@ -137,5 +137,5 @@ postlog unix-dgram n - n - 1 postlogd
|
|
#
|
|
#bsmtp unix - n n - - pipe
|
|
-# flags=Fq. user=bsmtp argv=/usr/local/sbin/bsmtp -f $sender $nexthop $recipient
|
|
+# flags=Fq. user=bsmtp argv=/usr/lib/bsmtp/bsmtp -f $sender $nexthop $recipient
|
|
#
|
|
#scalemail-backend unix - n n - 2 pipe
|