1.1 --- a/conf/postfix/ldap/lmtp_generic Sun Nov 01 00:28:31 2015 +0100
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,1 +0,0 @@
1.4 -/^local+(.*)@example\.com$/ ${1}@example.com
2.1 --- a/conf/postfix/ldap/master.cf.items Sun Nov 01 00:28:31 2015 +0100
2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
2.3 @@ -1,2 +0,0 @@
2.4 -lmtp unix - - n - - lmtp
2.5 - -o lmtp_generic_maps=regexp:/etc/postfix/ldap/lmtp_generic
3.1 --- a/conf/postfix/ldap/transport.items Sun Nov 01 00:28:31 2015 +0100
3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
3.3 @@ -1,4 +0,0 @@
3.4 -# Local delivery to Cyrus:
3.5 -#local@example.com lmtp:unix:/var/run/cyrus/socket/lmtp
3.6 -# Local delivery to Dovecot:
3.7 -#local@example.com lmtp:unix:/var/run/dovecot/lmtp
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/conf/postfix/lmtp/lmtp_generic Sun Nov 01 00:43:39 2015 +0100
4.3 @@ -0,0 +1,1 @@
4.4 +/^local+(.*)@example\.com$/ ${1}@example.com
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/conf/postfix/lmtp/master.cf.items Sun Nov 01 00:43:39 2015 +0100
5.3 @@ -0,0 +1,2 @@
5.4 +lmtp unix - - n - - lmtp
5.5 + -o lmtp_generic_maps=regexp:/etc/postfix/lmtp_generic
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/conf/postfix/lmtp/transport.items Sun Nov 01 00:43:39 2015 +0100
6.3 @@ -0,0 +1,4 @@
6.4 +# Local delivery to Cyrus:
6.5 +#local@example.com lmtp:unix:/var/run/cyrus/socket/lmtp
6.6 +# Local delivery to Dovecot:
6.7 +#local@example.com lmtp:unix:/var/run/dovecot/lmtp
7.1 --- a/conf/postfix/simple/lmtp_generic Sun Nov 01 00:28:31 2015 +0100
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,1 +0,0 @@
7.4 -/^(.*)@local\.example\.com$/ ${1}@example.com
8.1 --- a/conf/postfix/simple/main.cf.example Sun Nov 01 00:28:31 2015 +0100
8.2 +++ b/conf/postfix/simple/main.cf.example Sun Nov 01 00:43:39 2015 +0100
8.3 @@ -1,10 +1,8 @@
8.4 -# Uncomment the virtual_alias_maps_local_lmtp entry to support LMTP delivery,
8.5 -# or the virtual_alias_maps_local_system entry to support local system user
8.6 -# delivery.
8.7 +# Uncomment the virtual_alias_maps_local_system entry to support local system
8.8 +# user delivery.
8.9
8.10 virtual_alias_maps = $alias_maps, hash:/etc/postfix/virtual,
8.11 hash:/etc/postfix/simple/virtual_alias_maps
8.12 - #, hash:/etc/postfix/simple/virtual_alias_maps_local_lmtp
8.13 #, hash:/etc/postfix/simple/virtual_alias_maps_local_system
8.14
8.15 sender_bcc_maps = hash:/etc/postfix/simple/virtual_alias_maps_people_outgoing
9.1 --- a/conf/postfix/simple/master.cf.items Sun Nov 01 00:28:31 2015 +0100
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,2 +0,0 @@
9.4 -lmtp unix - - n - - lmtp
9.5 - -o lmtp_generic_maps=regexp:/etc/postfix/simple/lmtp_generic
10.1 --- a/conf/postfix/simple/transport.items Sun Nov 01 00:28:31 2015 +0100
10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
10.3 @@ -1,4 +0,0 @@
10.4 -# Local delivery to Cyrus:
10.5 -#local.example.com lmtp:unix:/var/run/cyrus/socket/lmtp
10.6 -# Local delivery to Dovecot:
10.7 -#local.example.com lmtp:unix:/var/run/dovecot/lmtp
11.1 --- a/conf/postfix/simple/virtual_alias_maps_local_lmtp Sun Nov 01 00:28:31 2015 +0100
11.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
11.3 @@ -1,2 +0,0 @@
11.4 -local+paul.boddie@example.com paul.boddie@local.example.com
11.5 -local+vincent.vole@example.com vincent.vole@local.example.com
12.1 --- a/docs/wiki/MailIntegration--LDAP Sun Nov 01 00:28:31 2015 +0100
12.2 +++ b/docs/wiki/MailIntegration--LDAP Sun Nov 01 00:43:39 2015 +0100
12.3 @@ -61,28 +61,6 @@
12.4 `virtual_alias_maps_resources.cf`
12.5 }}}
12.6
12.7 -Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
12.8 -files are also useful:
12.9 -
12.10 -{{{#!table
12.11 -'''File''' || '''Purpose'''
12.12 -==
12.13 -`lmtp_generic`
12.14 -|| Configures LMTP delivery for local recipients
12.15 -==
12.16 -`master.cf.items`
12.17 -|| Enables LMTP delivery for local recipients
12.18 -==
12.19 -`transport.items`
12.20 -|| Defines LMTP delivery methods for local recipients
12.21 -}}}
12.22 -
12.23 -These files can be incorporated into the Postfix configuration. On Debian
12.24 -systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
12.25 -`main.cf.example` can be merged into `/etc/postfix/main.cf`,
12.26 -`transport.items` can be merged into `/etc/postfix/transport`,
12.27 -whereas the remaining files would be installed into `/etc/postfix/ldap`.
12.28 -
12.29 The following files are common to LDAP and [[../Simple|simple]] integration
12.30 and are found in `conf/postfix`:
12.31
13.1 --- a/docs/wiki/MailIntegration--Simple Sun Nov 01 00:28:31 2015 +0100
13.2 +++ b/docs/wiki/MailIntegration--Simple Sun Nov 01 00:43:39 2015 +0100
13.3 @@ -68,33 +68,16 @@
13.4 }}}
13.5
13.6 Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
13.7 -files are also useful:
13.8 +file is also useful:
13.9
13.10 {{{#!table
13.11 '''File''' || '''Purpose'''
13.12 ==
13.13 -`lmtp_generic`
13.14 -|| Configures LMTP delivery for local recipients
13.15 -==
13.16 -`master.cf.items`
13.17 -|| Enables LMTP delivery for local recipients
13.18 -==
13.19 -`transport.items`
13.20 -|| Defines LMTP delivery methods for local recipients
13.21 -==
13.22 -`virtual_alias_maps_local_lmtp`
13.23 -|| Defines recipients for delivery to mailboxes for virtual users
13.24 -==
13.25 `virtual_alias_maps_local_system`
13.26 || Defines recipients for delivery to mailboxes for local system users
13.27 +.. (installed into `/etc/postfix/simple`)
13.28 }}}
13.29
13.30 -These files can be incorporated into the Postfix configuration. On Debian
13.31 -systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
13.32 -`main.cf.example` can be merged into `/etc/postfix/main.cf`,
13.33 -`transport.items` can be merged into `/etc/postfix/transport`,
13.34 -whereas the remaining files would be installed into `/etc/postfix/simple`.
13.35 -
13.36 The following files are common to [[../LDAP|LDAP]] and simple integration
13.37 and are found in `conf/postfix`:
13.38
14.1 --- a/docs/wiki/MailboxIntegration Sun Nov 01 00:28:31 2015 +0100
14.2 +++ b/docs/wiki/MailboxIntegration Sun Nov 01 00:43:39 2015 +0100
14.3 @@ -84,13 +84,17 @@
14.4 {{{#!table
14.5 '''File''' || '''Purpose'''
14.6 ==
14.7 -`main.cf.example`
14.8 -|| Defines mailbox transports for Cyrus and Dovecot
14.9 +`lmtp_generic`
14.10 +|| Configures LMTP delivery for local recipients (for installation into
14.11 +.. `/etc/postfix`)
14.12 ==
14.13 `master.cf.items`
14.14 -|| Defines the LMTP service
14.15 +|| Enables LMTP delivery for local recipients
14.16 +==
14.17 +`transport.items`
14.18 +|| Defines LMTP delivery methods for local recipients
14.19 }}}
14.20
14.21 -These files provide example definitions for the `main.cf` and `master.cf`
14.22 +These files provide example definitions for the `master.cf` and `transport`
14.23 files that typically reside under `/etc/postfix`. Their contents can be
14.24 merged with those files as appropriate.