5ed0aeed1b
- move non-config files out of /etc/postfix (#490983) - fix multilib conflict in postfix-files (#502211) - run chroot-update script in init script (#483186) - package examples (#251677) - provide all alternatives files - suppress postfix output in post script
104 lines
4.3 KiB
Diff
104 lines
4.3 KiB
Diff
diff -up postfix-2.6.1/conf/main.cf.config postfix-2.6.1/conf/main.cf
|
|
--- postfix-2.6.1/conf/main.cf.config 2007-12-18 14:50:25.000000000 +0100
|
|
+++ postfix-2.6.1/conf/main.cf 2009-05-22 17:04:40.000000000 +0200
|
|
@@ -113,6 +113,10 @@ mail_owner = postfix
|
|
#inet_interfaces = all
|
|
#inet_interfaces = $myhostname
|
|
#inet_interfaces = $myhostname, localhost
|
|
+inet_interfaces = localhost
|
|
+
|
|
+# Enable IPv4, and IPv6 if supported
|
|
+inet_protocols = all
|
|
|
|
# The proxy_interfaces parameter specifies the network interface
|
|
# addresses that this mail system receives mail on by way of a
|
|
@@ -157,7 +161,7 @@ mail_owner = postfix
|
|
#
|
|
# See also below, section "REJECTING MAIL FOR UNKNOWN LOCAL USERS".
|
|
#
|
|
-#mydestination = $myhostname, localhost.$mydomain, localhost
|
|
+mydestination = $myhostname, localhost.$mydomain, localhost
|
|
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain
|
|
#mydestination = $myhostname, localhost.$mydomain, localhost, $mydomain,
|
|
# mail.$mydomain, www.$mydomain, ftp.$mydomain
|
|
@@ -379,7 +383,7 @@ unknown_local_recipient_reject_code = 55
|
|
# "postfix reload" to eliminate the delay.
|
|
#
|
|
#alias_maps = dbm:/etc/aliases
|
|
-#alias_maps = hash:/etc/aliases
|
|
+alias_maps = hash:/etc/aliases
|
|
#alias_maps = hash:/etc/aliases, nis:mail.aliases
|
|
#alias_maps = netinfo:/aliases
|
|
|
|
@@ -390,7 +394,7 @@ unknown_local_recipient_reject_code = 55
|
|
#
|
|
#alias_database = dbm:/etc/aliases
|
|
#alias_database = dbm:/etc/mail/aliases
|
|
-#alias_database = hash:/etc/aliases
|
|
+alias_database = hash:/etc/aliases
|
|
#alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases
|
|
|
|
# ADDRESS EXTENSIONS (e.g., user+foo)
|
|
@@ -458,7 +462,29 @@ unknown_local_recipient_reject_code = 55
|
|
# the main.cf file, otherwise the SMTP server will reject mail for
|
|
# non-UNIX accounts with "User unknown in local recipient table".
|
|
#
|
|
-#mailbox_transport = lmtp:unix:/file/name
|
|
+#mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
|
|
+
|
|
+# If using the cyrus-imapd IMAP server deliver local mail to the IMAP
|
|
+# server using LMTP (Local Mail Transport Protocol), this is prefered
|
|
+# over the older cyrus deliver program by setting the
|
|
+# mailbox_transport as below:
|
|
+#
|
|
+# mailbox_transport = lmtp:unix:/var/lib/imap/socket/lmtp
|
|
+#
|
|
+# The efficiency of LMTP delivery for cyrus-imapd can be enhanced via
|
|
+# these settings.
|
|
+#
|
|
+# local_destination_recipient_limit = 300
|
|
+# local_destination_concurrency_limit = 5
|
|
+#
|
|
+# Of course you should adjust these settings as appropriate for the
|
|
+# capacity of the hardware you are using. The recipient limit setting
|
|
+# can be used to take advantage of the single instance message store
|
|
+# capability of Cyrus. The concurrency limit can be used to control
|
|
+# how many simultaneous LMTP sessions will be permitted to the Cyrus
|
|
+# message store.
|
|
+#
|
|
+# To use the old cyrus deliver program you have to set:
|
|
#mailbox_transport = cyrus
|
|
|
|
# The fallback_transport specifies the optional transport in master.cf
|
|
@@ -475,8 +501,7 @@ unknown_local_recipient_reject_code = 55
|
|
# the main.cf file, otherwise the SMTP server will reject mail for
|
|
# non-UNIX accounts with "User unknown in local recipient table".
|
|
#
|
|
-#fallback_transport = lmtp:unix:/file/name
|
|
-#fallback_transport = cyrus
|
|
+#fallback_transport = lmtp:unix:/var/lib/imap/socket/lmtp
|
|
#fallback_transport =
|
|
|
|
# The luser_relay parameter specifies an optional destination address
|
|
diff -up postfix-2.6.1/conf/master.cf.config postfix-2.6.1/conf/master.cf
|
|
--- postfix-2.6.1/conf/master.cf.config 2008-01-30 12:57:57.000000000 +0100
|
|
+++ postfix-2.6.1/conf/master.cf 2009-05-22 16:38:30.000000000 +0200
|
|
@@ -68,7 +68,7 @@ scache unix - - n
|
|
# The Cyrus deliver program has changed incompatibly, multiple times.
|
|
#
|
|
#old-cyrus unix - n n - - pipe
|
|
-# flags=R user=cyrus argv=/cyrus/bin/deliver -e -m ${extension} ${user}
|
|
+# flags=R user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -m ${extension} ${user}
|
|
#
|
|
# ====================================================================
|
|
#
|
|
@@ -76,7 +76,7 @@ scache unix - - n
|
|
# Also specify in main.cf: cyrus_destination_recipient_limit=1
|
|
#
|
|
#cyrus unix - n n - - pipe
|
|
-# user=cyrus argv=/cyrus/bin/deliver -e -r ${sender} -m ${extension} ${user}
|
|
+# user=cyrus argv=/usr/lib/cyrus-imapd/deliver -e -r ${sender} -m ${extension} ${user}
|
|
#
|
|
# ====================================================================
|
|
#
|