Blame SOURCES/postfix-3.2.0-config.patch

aebf40
diff --git a/conf/main.cf b/conf/main.cf
aebf40
index 7af8bde..fbe5c62 100644
aebf40
--- a/conf/main.cf
aebf40
+++ b/conf/main.cf
aebf40
@@ -132,6 +132,10 @@ mail_owner = postfix
aebf40
 #inet_interfaces = all
aebf40
 #inet_interfaces = $myhostname
aebf40
 #inet_interfaces = $myhostname, localhost
aebf40
+inet_interfaces = localhost
aebf40
+
aebf40
+# Enable IPv4, and IPv6 if supported
aebf40
+inet_protocols = all
aebf40
 
aebf40
 # The proxy_interfaces parameter specifies the network interface
aebf40
 # addresses that this mail system receives mail on by way of a
aebf40
@@ -176,7 +180,7 @@ mail_owner = postfix
aebf40
 #
aebf40
 # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
aebf40
 #
aebf40
-#mydestination = $myhostname, localhost.$mydomain, localhost
aebf40
+mydestination = $myhostname, localhost.$mydomain, localhost
aebf40
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
aebf40
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
aebf40
 #	mail.$mydomain, www.$mydomain, ftp.$mydomain
aebf40
@@ -398,7 +402,7 @@ unknown_local_recipient_reject_code = 550
aebf40
 # "postfix reload" to eliminate the delay.
aebf40
 #
aebf40
 #alias_maps = dbm:/etc/aliases
aebf40
-#alias_maps = hash:/etc/aliases
aebf40
+alias_maps = hash:/etc/aliases
aebf40
 #alias_maps = hash:/etc/aliases, nis:mail.aliases
aebf40
 #alias_maps = netinfo:/aliases
aebf40
 
aebf40
@@ -409,7 +413,7 @@ unknown_local_recipient_reject_code = 550
aebf40
 #
aebf40
 #alias_database = dbm:/etc/aliases
aebf40
 #alias_database = dbm:/etc/mail/aliases
aebf40
-#alias_database = hash:/etc/aliases
aebf40
+alias_database = hash:/etc/aliases
aebf40
 #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
aebf40
 
aebf40
 # ADDRESS EXTENSIONS (e.g., user+foo)
aebf40
@@ -479,7 +483,27 @@ unknown_local_recipient_reject_code = 550
aebf40
 #
aebf40
 # Cyrus IMAP over LMTP. Specify ``lmtpunix      cmd="lmtpd"
aebf40
 # listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf.
aebf40
-#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp
aebf40
+#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
aebf40
+
aebf40
+# If using the cyrus-imapd IMAP server deliver local mail to the IMAP
aebf40
+# server using LMTP (Local Mail Transport Protocol), this is prefered
aebf40
+# over the older cyrus deliver program by setting the
aebf40
+# mailbox_transport as below:
aebf40
+#
aebf40
+# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
aebf40
+#
aebf40
+# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via
aebf40
+# these settings.
aebf40
+#
aebf40
+# local_destination_recipient_limit = 300
aebf40
+# local_destination_concurrency_limit = 5
aebf40
+#
aebf40
+# Of course you should adjust these settings as appropriate for the
aebf40
+# capacity of the hardware you are using. The recipient limit setting
aebf40
+# can be used to take advantage of the single instance message store
aebf40
+# capability of Cyrus. The concurrency limit can be used to control
aebf40
+# how many simultaneous LMTP sessions will be permitted to the Cyrus
aebf40
+# message store.
aebf40
 #
aebf40
 # Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and
aebf40
 # subsequent line in master.cf.
aebf40
@@ -499,8 +523,7 @@ unknown_local_recipient_reject_code = 550
aebf40
 # the main.cf file, otherwise the SMTP server will reject mail for    
aebf40
 # non-UNIX accounts with "User unknown in local recipient table".
aebf40
 #
aebf40
-#fallback_transport = lmtp:unix:/file/name
aebf40
-#fallback_transport = cyrus
aebf40
+#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp
aebf40
 #fallback_transport =
aebf40
 
aebf40
 # The luser_relay parameter specifies an optional destination address
aebf40
@@ -673,4 +696,41 @@ sample_directory =
aebf40
 # readme_directory: The location of the Postfix README files.
aebf40
 #
aebf40
 readme_directory =
aebf40
-inet_protocols = ipv4
aebf40
+
aebf40
+# TLS CONFIGURATION
aebf40
+#
aebf40
+# Basic Postfix TLS configuration by default with self-signed certificate
aebf40
+# for inbound SMTP and also opportunistic TLS for outbound SMTP.
aebf40
+
aebf40
+# The full pathname of a file with the Postfix SMTP server RSA certificate
aebf40
+# in PEM format. Intermediate certificates should be included in general,
aebf40
+# the server certificate first, then the issuing CA(s) (bottom-up order).
aebf40
+#
aebf40
+smtpd_tls_cert_file = /etc/pki/tls/certs/postfix.pem
aebf40
+
aebf40
+# The full pathname of a file with the Postfix SMTP server RSA private key
aebf40
+# in PEM format. The private key must be accessible without a pass-phrase,
aebf40
+# i.e. it must not be encrypted.
aebf40
+#
aebf40
+smtpd_tls_key_file = /etc/pki/tls/private/postfix.key
aebf40
+
aebf40
+# Announce STARTTLS support to remote SMTP clients, but do not require that
aebf40
+# clients use TLS encryption (opportunistic TLS inbound).
aebf40
+#
aebf40
+smtpd_tls_security_level = may
aebf40
+
aebf40
+# Directory with PEM format Certification Authority certificates that the
aebf40
+# Postfix SMTP client uses to verify a remote SMTP server certificate.
aebf40
+#
aebf40
+smtp_tls_CApath = /etc/pki/tls/certs
aebf40
+
aebf40
+# The full pathname of a file containing CA certificates of root CAs
aebf40
+# trusted to sign either remote SMTP server certificates or intermediate CA
aebf40
+# certificates.
aebf40
+#
aebf40
+smtp_tls_CAfile = /etc/pki/tls/certs/ca-bundle.crt
aebf40
+
aebf40
+# Use TLS if this is supported by the remote SMTP server, otherwise use
aebf40
+# plaintext (opportunistic TLS outbound).
aebf40
+#
aebf40
+smtp_tls_security_level = may
aebf40
diff --git a/conf/master.cf b/conf/master.cf
aebf40
index b67ed59..a9633ba 100644
aebf40
--- a/conf/master.cf
aebf40
+++ b/conf/master.cf
aebf40
@@ -96,14 +96,14 @@ scache    unix  -       -       n       -       1       scache
aebf40
 # Also specify in main.cf: cyrus_destination_recipient_limit=1
aebf40
 #
aebf40
 #cyrus     unix  -       n       n       -       -       pipe
aebf40
-#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
aebf40
+#  user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
aebf40
 #
aebf40
 # ====================================================================
aebf40
 #
aebf40
 # Old example of delivery via Cyrus.
aebf40
 #
aebf40
 #old-cyrus unix  -       n       n       -       -       pipe
aebf40
-#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
aebf40
+#  flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user}
aebf40
 #
aebf40
 # ====================================================================
aebf40
 #