1.1 --- a/conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local Sat Oct 31 01:11:21 2015 +0100
1.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
1.3 @@ -1,8 +0,0 @@
1.4 -cyrus_lmtp_local:
1.5 - debug_print = "R: cyrus_lmtp_local for $local_part@$domain"
1.6 - driver = accept
1.7 - domains = +local_domains
1.8 - check_local_user
1.9 - local_parts = ! root
1.10 - transport = cyrus_lmtp
1.11 - cannot_route_message = Unknown user
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local_lmtp Sat Oct 31 14:31:44 2015 +0100
2.3 @@ -0,0 +1,8 @@
2.4 +cyrus_lmtp_local_lmtp:
2.5 + debug_print = "R: cyrus_lmtp_local_lmtp for $local_part@$domain"
2.6 + driver = accept
2.7 + domains = lsearch;/etc/exim4/virtual_domains
2.8 + local_part_prefix = local+
2.9 + local_parts = lsearch;/etc/exim4/virtual_people
2.10 + transport = cyrus_lmtp
2.11 + cannot_route_message = Unknown user
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local_system Sat Oct 31 14:31:44 2015 +0100
3.3 @@ -0,0 +1,9 @@
3.4 +cyrus_lmtp_local_system:
3.5 + debug_print = "R: cyrus_lmtp_local_system for $local_part@$domain"
3.6 + driver = accept
3.7 + domains = +local_domains
3.8 + check_local_user
3.9 + local_part_prefix = local+
3.10 + local_parts = ! root
3.11 + transport = cyrus_lmtp
3.12 + cannot_route_message = Unknown user
4.1 --- a/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local Sat Oct 31 01:11:21 2015 +0100
4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
4.3 @@ -1,8 +0,0 @@
4.4 -dovecot_lmtp_local:
4.5 - debug_print = "R: dovecot_lmtp_local for $local_part@$domain"
4.6 - driver = accept
4.7 - domains = +local_domains
4.8 - check_local_user
4.9 - local_parts = ! root
4.10 - transport = dovecot_lmtp
4.11 - cannot_route_message = Unknown user
5.1 --- a/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_lmtp Sat Oct 31 01:11:21 2015 +0100
5.2 +++ b/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_lmtp Sat Oct 31 14:31:44 2015 +0100
5.3 @@ -1,8 +1,8 @@
5.4 dovecot_lmtp_local_lmtp:
5.5 debug_print = "R: dovecot_lmtp_local_lmtp for $local_part@$domain"
5.6 driver = accept
5.7 - domains = +local_domains
5.8 - local_part_prefix = lmtp+
5.9 + domains = lsearch;/etc/exim4/virtual_domains
5.10 + local_part_prefix = local+
5.11 local_parts = lsearch;/etc/exim4/virtual_people
5.12 transport = dovecot_lmtp
5.13 cannot_route_message = Unknown user
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_system Sat Oct 31 14:31:44 2015 +0100
6.3 @@ -0,0 +1,9 @@
6.4 +dovecot_lmtp_local_system:
6.5 + debug_print = "R: dovecot_lmtp_local_system for $local_part@$domain"
6.6 + driver = accept
6.7 + domains = +local_domains
6.8 + check_local_user
6.9 + local_part_prefix = local+
6.10 + local_parts = ! root
6.11 + transport = dovecot_lmtp
6.12 + cannot_route_message = Unknown user
7.1 --- a/conf/exim/simple/020_exim4-config_people_local Sat Oct 31 01:11:21 2015 +0100
7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
7.3 @@ -1,7 +0,0 @@
7.4 -simple_local_person:
7.5 - debug_print = "R: simple_local_person for $local_part@$domain"
7.6 - driver = redirect
7.7 - domains = lsearch;/etc/exim4/virtual_domains
7.8 - data = ${lookup{$local_part}lsearch{/etc/exim4/virtual_people_local}}
7.9 - #data = ${lookup{$local_part}lsearch{/etc/exim4/virtual_people_local_lmtp}}
7.10 - cannot_route_message = Unknown user
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/conf/exim/simple/020_exim4-config_people_local_system Sat Oct 31 14:31:44 2015 +0100
8.3 @@ -0,0 +1,6 @@
8.4 +simple_local_person:
8.5 + debug_print = "R: simple_local_person for $local_part@$domain"
8.6 + driver = redirect
8.7 + domains = lsearch;/etc/exim4/virtual_domains
8.8 + data = ${lookup{$local_part}lsearch{/etc/exim4/virtual_people_local_system}}
8.9 + cannot_route_message = Unknown user
9.1 --- a/conf/exim/simple/virtual_people_local Sat Oct 31 01:11:21 2015 +0100
9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
9.3 @@ -1,2 +0,0 @@
9.4 -local+paul.boddie: paulb
9.5 -local+vincent.vole: vole
10.1 --- a/conf/exim/simple/virtual_people_local_lmtp Sat Oct 31 01:11:21 2015 +0100
10.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
10.3 @@ -1,2 +0,0 @@
10.4 -local+paul.boddie: lmtp+paul.boddie
10.5 -local+vincent.vole: lmtp+vincent.vole
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
11.2 +++ b/conf/exim/simple/virtual_people_local_system Sat Oct 31 14:31:44 2015 +0100
11.3 @@ -0,0 +1,2 @@
11.4 +local+paul.boddie: local+paulb
11.5 +local+vincent.vole: local+vole
12.1 --- a/docs/wiki/MailIntegration--Simple Sat Oct 31 01:11:21 2015 +0100
12.2 +++ b/docs/wiki/MailIntegration--Simple Sat Oct 31 14:31:44 2015 +0100
12.3 @@ -35,20 +35,18 @@
12.4 || Defines recipient domains
12.5 }}}
12.6
12.7 -Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
12.8 -files are also useful:
12.9 +Where [[../LocalSMTP|local SMTP routing]] is being performed ''and'' the
12.10 +recipients are local system users, the following files are also useful:
12.11
12.12 {{{#!table
12.13 '''File''' || '''Purpose'''
12.14 ==
12.15 -`020_exim4-config_people_local`
12.16 -|| Defines routing for local recipients for delivery to local mailboxes
12.17 +`020_exim4-config_people_local_system`
12.18 +|| Defines routing for local recipients for delivery to mailboxes for local
12.19 +.. system users
12.20 ==
12.21 -`virtual_people_local`
12.22 +`virtual_people_local_system`
12.23 || Defines recipients for delivery to mailboxes for local system users
12.24 -==
12.25 -`virtual_people_local_lmtp`
12.26 -|| Defines recipients for delivery to mailboxes for true virtual users
12.27 }}}
12.28
12.29 These files can be incorporated into the Exim configuration. On Debian
12.30 @@ -71,8 +69,8 @@
12.31 `virtual_alias_maps_people_outgoing`
12.32 }}}
12.33
12.34 -Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
12.35 -file is also useful:
12.36 +Where [[../LocalSMTP|local SMTP routing]] is being performed ''and'' the
12.37 +recipients are local system users, the following file is also useful:
12.38
12.39 {{{#!table
12.40 '''File''' || '''Purpose'''
13.1 --- a/docs/wiki/MailboxIntegration Sat Oct 31 01:11:21 2015 +0100
13.2 +++ b/docs/wiki/MailboxIntegration Sat Oct 31 14:31:44 2015 +0100
13.3 @@ -47,21 +47,24 @@
13.4 {{{#!table
13.5 '''File''' || '''Purpose'''
13.6 ==
13.7 -`890_exim4-config_cyrus_lmtp_local`
13.8 +`890_exim4-config_cyrus_lmtp_local_system`
13.9 || Routes messages for local system users to Cyrus
13.10 ==
13.11 -`890_exim4-config_dovecot_lmtp_local`
13.12 +`890_exim4-config_cyrus_lmtp_local_lmtp`
13.13 +|| Routes messages for local virtual users to Cyrus
13.14 +==
13.15 +`890_exim4-config_dovecot_lmtp_local_system`
13.16 || Routes messages for local system users to Dovecot
13.17 ==
13.18 `890_exim4-config_dovecot_lmtp_local_lmtp`
13.19 -|| Routes messages for local virtual users to Dovecot using an `lmtp`
13.20 -.. prefix
13.21 +|| Routes messages for local virtual users to Dovecot
13.22 }}}
13.23
13.24 On Debian systems, these files would be copied into the `/etc/exim4/conf.d/router`
13.25 directory. Depending on whether system user identities are to be employed for mail
13.26 or whether genuine virtual identities (not connected to the system) are to be
13.27 -employed, one of these files should be selected.
13.28 +employed, one type (`local_system` or `local_lmtp`) of these files should be
13.29 +selected.
13.30
13.31 == Postfix ==
13.32