Blame SOURCES/postfix-2.10.0-config.patch

e61286
diff --git a/conf/main.cf b/conf/main.cf
e61286
index 8d301aa..57e865f 100644
e61286
--- a/conf/main.cf
e61286
+++ b/conf/main.cf
e61286
@@ -113,6 +113,10 @@ mail_owner = postfix
e61286
 #inet_interfaces = all
e61286
 #inet_interfaces = $myhostname
e61286
 #inet_interfaces = $myhostname, localhost
e61286
+inet_interfaces = localhost
e61286
+
e61286
+# Enable IPv4, and IPv6 if supported
e61286
+inet_protocols = all
e61286
 
e61286
 # The proxy_interfaces parameter specifies the network interface
e61286
 # addresses that this mail system receives mail on by way of a
e61286
@@ -157,7 +161,7 @@ mail_owner = postfix
e61286
 #
e61286
 # See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
e61286
 #
e61286
-#mydestination = $myhostname, localhost.$mydomain, localhost
e61286
+mydestination = $myhostname, localhost.$mydomain, localhost
e61286
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
e61286
 #mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
e61286
 #	mail.$mydomain, www.$mydomain, ftp.$mydomain
e61286
@@ -379,7 +383,7 @@ unknown_local_recipient_reject_code = 550
e61286
 # "postfix reload" to eliminate the delay.
e61286
 #
e61286
 #alias_maps = dbm:/etc/aliases
e61286
-#alias_maps = hash:/etc/aliases
e61286
+alias_maps = hash:/etc/aliases
e61286
 #alias_maps = hash:/etc/aliases, nis:mail.aliases
e61286
 #alias_maps = netinfo:/aliases
e61286
 
e61286
@@ -390,7 +394,7 @@ unknown_local_recipient_reject_code = 550
e61286
 #
e61286
 #alias_database = dbm:/etc/aliases
e61286
 #alias_database = dbm:/etc/mail/aliases
e61286
-#alias_database = hash:/etc/aliases
e61286
+alias_database = hash:/etc/aliases
e61286
 #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
e61286
 
e61286
 # ADDRESS EXTENSIONS (e.g., user+foo)
e61286
@@ -460,7 +464,27 @@ unknown_local_recipient_reject_code = 550
e61286
 #
e61286
 # Cyrus IMAP over LMTP. Specify ``lmtpunix      cmd="lmtpd"
e61286
 # listen="/var/imap/socket/lmtp" prefork=0'' in cyrus.conf.
e61286
-#mailbox_transport = lmtp:unix:/var/imap/socket/lmtp
e61286
+#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
e61286
+
e61286
+# If using the cyrus-imapd IMAP server deliver local mail to the IMAP
e61286
+# server using LMTP (Local Mail Transport Protocol), this is prefered
e61286
+# over the older cyrus deliver program by setting the
e61286
+# mailbox_transport as below:
e61286
+#
e61286
+# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
e61286
+#
e61286
+# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via
e61286
+# these settings.
e61286
+#
e61286
+# local_destination_recipient_limit = 300
e61286
+# local_destination_concurrency_limit = 5
e61286
+#
e61286
+# Of course you should adjust these settings as appropriate for the
e61286
+# capacity of the hardware you are using. The recipient limit setting
e61286
+# can be used to take advantage of the single instance message store
e61286
+# capability of Cyrus. The concurrency limit can be used to control
e61286
+# how many simultaneous LMTP sessions will be permitted to the Cyrus
e61286
+# message store. 
e61286
 #
e61286
 # Cyrus IMAP via command line. Uncomment the "cyrus...pipe" and
e61286
 # subsequent line in master.cf.
e61286
@@ -480,8 +504,7 @@ unknown_local_recipient_reject_code = 550
e61286
 # the main.cf file, otherwise the SMTP server will reject mail for    
e61286
 # non-UNIX accounts with "User unknown in local recipient table".
e61286
 #
e61286
-#fallback_transport = lmtp:unix:/file/name
e61286
-#fallback_transport = cyrus
e61286
+#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp
e61286
 #fallback_transport =
e61286
 
e61286
 # The luser_relay parameter specifies an optional destination address
e61286
@@ -654,4 +677,3 @@ sample_directory =
e61286
 # readme_directory: The location of the Postfix README files.
e61286
 #
e61286
 readme_directory =
e61286
-inet_protocols = ipv4
e61286
diff --git a/conf/master.cf b/conf/master.cf
e61286
index acc67d7..bc15d38 100644
e61286
--- a/conf/master.cf
e61286
+++ b/conf/master.cf
e61286
@@ -92,14 +92,14 @@ scache    unix  -       -       n       -       1       scache
e61286
 # Also specify in main.cf: cyrus_destination_recipient_limit=1
e61286
 #
e61286
 #cyrus     unix  -       n       n       -       -       pipe
e61286
-#  user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
e61286
+#  user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
e61286
 #
e61286
 # ====================================================================
e61286
 #
e61286
 # Old example of delivery via Cyrus.
e61286
 #
e61286
 #old-cyrus unix  -       n       n       -       -       pipe
e61286
-#  flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
e61286
+#  flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user}
e61286
 #
e61286
 # ====================================================================
e61286
 #