# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1446326036 -3600
# Node ID b56bfee3fff15ed2acde02675ff8b3f6d65b1617
# Parent  5cc56a901e9e8336634b44a115cfff1470f8a848
Tidied up Postfix details for local recipients, at least for the simple method
and for local system users.

diff -r 5cc56a901e9e -r b56bfee3fff1 conf/postfix/lmtp/main.cf.example
--- a/conf/postfix/lmtp/main.cf.example	Sat Oct 31 18:09:13 2015 +0100
+++ b/conf/postfix/lmtp/main.cf.example	Sat Oct 31 22:13:56 2015 +0100
@@ -1,7 +1,7 @@
 # Enable one of these...
 
 # For Cyrus:
-#mailbox_transport = lmtp:unix:/var/run/cyrus/socket/lmtp
+#virtual_transport = lmtp:unix:/var/run/cyrus/socket/lmtp
 
 # For Dovecot:
-#mailbox_transport = lmtp:unix:/var/run/dovecot/lmtp
+#virtual_transport = lmtp:unix:/var/run/dovecot/lmtp
diff -r 5cc56a901e9e -r b56bfee3fff1 conf/postfix/transport
--- a/conf/postfix/transport	Sat Oct 31 18:09:13 2015 +0100
+++ b/conf/postfix/transport	Sat Oct 31 22:13:56 2015 +0100
@@ -4,7 +4,3 @@
 people@example.com		imip_people:
 # iMIP content handling for example.com via the people-outgoing address:
 people-outgoing@example.com	imip_people_outgoing:
-# Explicit local recipients using the local transport:
-#local@example.com		local:
-# Explicit local recipients using the lmtp transport:
-#local@example.com		lmtp:
diff -r 5cc56a901e9e -r b56bfee3fff1 docs/wiki/MailIntegration--LDAP
--- a/docs/wiki/MailIntegration--LDAP	Sat Oct 31 18:09:13 2015 +0100
+++ b/docs/wiki/MailIntegration--LDAP	Sat Oct 31 22:13:56 2015 +0100
@@ -65,8 +65,26 @@
 systems, `main.cf.example` can be merged into `/etc/postfix/main.cf`,
 whereas the remaining files would be installed into `/etc/postfix/ldap`.
 
-Where [[../LocalSMTP|local SMTP routing]] is being performed, the local
-recipient entry in the `conf/postfix/transport` file is used.
+The following files are common to LDAP and [[../Simple|simple]] integration
+and are found in `conf/postfix`:
+
+{{{#!table
+'''File''' || '''Purpose'''
+==
+`master.cf.items`
+|| Mail handler definitions for the imip-agent transports
+==
+`transport`
+|| Transport definitions for `/etc/postfix/transport`
+==
+`virtual`
+|| Outgoing message routing for `/etc/postfix/virtual`
+}}}
+
+These files can be incorporated into the Postfix configuration. On Debian
+systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
+whereas the other files can be merged into any existing files of the same
+names in `/etc/postfix`.
 
 == LDAP Representations for Mail Recipients ==
 
diff -r 5cc56a901e9e -r b56bfee3fff1 docs/wiki/MailIntegration--Simple
--- a/docs/wiki/MailIntegration--Simple	Sat Oct 31 18:09:13 2015 +0100
+++ b/docs/wiki/MailIntegration--Simple	Sat Oct 31 22:13:56 2015 +0100
@@ -79,4 +79,25 @@
 
 These files can be incorporated into the Postfix configuration. On Debian
 systems, `main.cf.example` can be merged into `/etc/postfix/main.cf`,
-whereas the remaining files would be installed into `/etc/postfix`.
+whereas the remaining files would be installed into `/etc/postfix/simple`.
+
+The following files are common to [[../LDAP|LDAP]] and simple integration
+and are found in `conf/postfix`:
+
+{{{#!table
+'''File''' || '''Purpose'''
+==
+`master.cf.items`
+|| Mail handler definitions for the imip-agent transports
+==
+`transport`
+|| Transport definitions for `/etc/postfix/transport`
+==
+`virtual`
+|| Outgoing message routing for `/etc/postfix/virtual`
+}}}
+
+These files can be incorporated into the Postfix configuration. On Debian
+systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
+whereas the other files can be merged into any existing files of the same
+names in `/etc/postfix`.