1.1 --- a/conf/postfix/lmtp/main.cf.example Sat Oct 31 18:09:13 2015 +0100
1.2 +++ b/conf/postfix/lmtp/main.cf.example Sat Oct 31 22:13:56 2015 +0100
1.3 @@ -1,7 +1,7 @@
1.4 # Enable one of these...
1.5
1.6 # For Cyrus:
1.7 -#mailbox_transport = lmtp:unix:/var/run/cyrus/socket/lmtp
1.8 +#virtual_transport = lmtp:unix:/var/run/cyrus/socket/lmtp
1.9
1.10 # For Dovecot:
1.11 -#mailbox_transport = lmtp:unix:/var/run/dovecot/lmtp
1.12 +#virtual_transport = lmtp:unix:/var/run/dovecot/lmtp
2.1 --- a/conf/postfix/transport Sat Oct 31 18:09:13 2015 +0100
2.2 +++ b/conf/postfix/transport Sat Oct 31 22:13:56 2015 +0100
2.3 @@ -4,7 +4,3 @@
2.4 people@example.com imip_people:
2.5 # iMIP content handling for example.com via the people-outgoing address:
2.6 people-outgoing@example.com imip_people_outgoing:
2.7 -# Explicit local recipients using the local transport:
2.8 -#local@example.com local:
2.9 -# Explicit local recipients using the lmtp transport:
2.10 -#local@example.com lmtp:
3.1 --- a/docs/wiki/MailIntegration--LDAP Sat Oct 31 18:09:13 2015 +0100
3.2 +++ b/docs/wiki/MailIntegration--LDAP Sat Oct 31 22:13:56 2015 +0100
3.3 @@ -65,8 +65,26 @@
3.4 systems, `main.cf.example` can be merged into `/etc/postfix/main.cf`,
3.5 whereas the remaining files would be installed into `/etc/postfix/ldap`.
3.6
3.7 -Where [[../LocalSMTP|local SMTP routing]] is being performed, the local
3.8 -recipient entry in the `conf/postfix/transport` file is used.
3.9 +The following files are common to LDAP and [[../Simple|simple]] integration
3.10 +and are found in `conf/postfix`:
3.11 +
3.12 +{{{#!table
3.13 +'''File''' || '''Purpose'''
3.14 +==
3.15 +`master.cf.items`
3.16 +|| Mail handler definitions for the imip-agent transports
3.17 +==
3.18 +`transport`
3.19 +|| Transport definitions for `/etc/postfix/transport`
3.20 +==
3.21 +`virtual`
3.22 +|| Outgoing message routing for `/etc/postfix/virtual`
3.23 +}}}
3.24 +
3.25 +These files can be incorporated into the Postfix configuration. On Debian
3.26 +systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
3.27 +whereas the other files can be merged into any existing files of the same
3.28 +names in `/etc/postfix`.
3.29
3.30 == LDAP Representations for Mail Recipients ==
3.31
4.1 --- a/docs/wiki/MailIntegration--Simple Sat Oct 31 18:09:13 2015 +0100
4.2 +++ b/docs/wiki/MailIntegration--Simple Sat Oct 31 22:13:56 2015 +0100
4.3 @@ -79,4 +79,25 @@
4.4
4.5 These files can be incorporated into the Postfix configuration. On Debian
4.6 systems, `main.cf.example` can be merged into `/etc/postfix/main.cf`,
4.7 -whereas the remaining files would be installed into `/etc/postfix`.
4.8 +whereas the remaining files would be installed into `/etc/postfix/simple`.
4.9 +
4.10 +The following files are common to [[../LDAP|LDAP]] and simple integration
4.11 +and are found in `conf/postfix`:
4.12 +
4.13 +{{{#!table
4.14 +'''File''' || '''Purpose'''
4.15 +==
4.16 +`master.cf.items`
4.17 +|| Mail handler definitions for the imip-agent transports
4.18 +==
4.19 +`transport`
4.20 +|| Transport definitions for `/etc/postfix/transport`
4.21 +==
4.22 +`virtual`
4.23 +|| Outgoing message routing for `/etc/postfix/virtual`
4.24 +}}}
4.25 +
4.26 +These files can be incorporated into the Postfix configuration. On Debian
4.27 +systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
4.28 +whereas the other files can be merged into any existing files of the same
4.29 +names in `/etc/postfix`.