# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1446298304 -3600
# Node ID 34e22c3c0bf9f68d0323284aa90f64c5d554cb45
# Parent  619699f48fc90545da6cfb6b68763dbfd909f494
Changed local recipient delivery to use the "local+" prefix, with the LMTP
delivery routing insisting on this prefix.
Removed the redirection of addresses for local virtual users (which used the
"lmtp+" prefix) since it is now superfluous.
Renamed various files to more accurately indicate their purpose.

diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local
--- a/conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local	Sat Oct 31 01:11:21 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-cyrus_lmtp_local:
-  debug_print = "R: cyrus_lmtp_local for $local_part@$domain"
-  driver = accept
-  domains = +local_domains
-  check_local_user
-  local_parts = ! root
-  transport = cyrus_lmtp
-  cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local_lmtp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local_lmtp	Sat Oct 31 14:31:44 2015 +0100
@@ -0,0 +1,8 @@
+cyrus_lmtp_local_lmtp:
+  debug_print = "R: cyrus_lmtp_local_lmtp for $local_part@$domain"
+  driver = accept
+  domains = lsearch;/etc/exim4/virtual_domains
+  local_part_prefix = local+
+  local_parts = lsearch;/etc/exim4/virtual_people
+  transport = cyrus_lmtp
+  cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local_system
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/lmtp/890_exim4-config_cyrus_lmtp_local_system	Sat Oct 31 14:31:44 2015 +0100
@@ -0,0 +1,9 @@
+cyrus_lmtp_local_system:
+  debug_print = "R: cyrus_lmtp_local_system for $local_part@$domain"
+  driver = accept
+  domains = +local_domains
+  check_local_user
+  local_part_prefix = local+
+  local_parts = ! root
+  transport = cyrus_lmtp
+  cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local
--- a/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local	Sat Oct 31 01:11:21 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-dovecot_lmtp_local:
-  debug_print = "R: dovecot_lmtp_local for $local_part@$domain"
-  driver = accept
-  domains = +local_domains
-  check_local_user
-  local_parts = ! root
-  transport = dovecot_lmtp
-  cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_lmtp
--- a/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_lmtp	Sat Oct 31 01:11:21 2015 +0100
+++ b/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_lmtp	Sat Oct 31 14:31:44 2015 +0100
@@ -1,8 +1,8 @@
 dovecot_lmtp_local_lmtp:
   debug_print = "R: dovecot_lmtp_local_lmtp for $local_part@$domain"
   driver = accept
-  domains = +local_domains
-  local_part_prefix = lmtp+
+  domains = lsearch;/etc/exim4/virtual_domains
+  local_part_prefix = local+
   local_parts = lsearch;/etc/exim4/virtual_people
   transport = dovecot_lmtp
   cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_system
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/lmtp/890_exim4-config_dovecot_lmtp_local_system	Sat Oct 31 14:31:44 2015 +0100
@@ -0,0 +1,9 @@
+dovecot_lmtp_local_system:
+  debug_print = "R: dovecot_lmtp_local_system for $local_part@$domain"
+  driver = accept
+  domains = +local_domains
+  check_local_user
+  local_part_prefix = local+
+  local_parts = ! root
+  transport = dovecot_lmtp
+  cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/simple/020_exim4-config_people_local
--- a/conf/exim/simple/020_exim4-config_people_local	Sat Oct 31 01:11:21 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-simple_local_person:
-  debug_print = "R: simple_local_person for $local_part@$domain"
-  driver = redirect
-  domains = lsearch;/etc/exim4/virtual_domains
-  data = ${lookup{$local_part}lsearch{/etc/exim4/virtual_people_local}}
-  #data = ${lookup{$local_part}lsearch{/etc/exim4/virtual_people_local_lmtp}}
-  cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/simple/020_exim4-config_people_local_system
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/simple/020_exim4-config_people_local_system	Sat Oct 31 14:31:44 2015 +0100
@@ -0,0 +1,6 @@
+simple_local_person:
+  debug_print = "R: simple_local_person for $local_part@$domain"
+  driver = redirect
+  domains = lsearch;/etc/exim4/virtual_domains
+  data = ${lookup{$local_part}lsearch{/etc/exim4/virtual_people_local_system}}
+  cannot_route_message = Unknown user
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/simple/virtual_people_local
--- a/conf/exim/simple/virtual_people_local	Sat Oct 31 01:11:21 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-local+paul.boddie: paulb
-local+vincent.vole: vole
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/simple/virtual_people_local_lmtp
--- a/conf/exim/simple/virtual_people_local_lmtp	Sat Oct 31 01:11:21 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-local+paul.boddie: lmtp+paul.boddie
-local+vincent.vole: lmtp+vincent.vole
diff -r 619699f48fc9 -r 34e22c3c0bf9 conf/exim/simple/virtual_people_local_system
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/simple/virtual_people_local_system	Sat Oct 31 14:31:44 2015 +0100
@@ -0,0 +1,2 @@
+local+paul.boddie: local+paulb
+local+vincent.vole: local+vole
diff -r 619699f48fc9 -r 34e22c3c0bf9 docs/wiki/MailIntegration--Simple
--- a/docs/wiki/MailIntegration--Simple	Sat Oct 31 01:11:21 2015 +0100
+++ b/docs/wiki/MailIntegration--Simple	Sat Oct 31 14:31:44 2015 +0100
@@ -35,20 +35,18 @@
 || Defines recipient domains
 }}}
 
-Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
-files are also useful:
+Where [[../LocalSMTP|local SMTP routing]] is being performed ''and'' the
+recipients are local system users, the following files are also useful:
 
 {{{#!table
 '''File''' || '''Purpose'''
 ==
-`020_exim4-config_people_local`
-|| Defines routing for local recipients for delivery to local mailboxes
+`020_exim4-config_people_local_system`
+|| Defines routing for local recipients for delivery to mailboxes for local
+.. system users
 ==
-`virtual_people_local`
+`virtual_people_local_system`
 || Defines recipients for delivery to mailboxes for local system users
-==
-`virtual_people_local_lmtp`
-|| Defines recipients for delivery to mailboxes for true virtual users
 }}}
 
 These files can be incorporated into the Exim configuration. On Debian
@@ -71,8 +69,8 @@
 `virtual_alias_maps_people_outgoing`
 }}}
 
-Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
-file is also useful:
+Where [[../LocalSMTP|local SMTP routing]] is being performed ''and'' the
+recipients are local system users, the following file is also useful:
 
 {{{#!table
 '''File''' || '''Purpose'''
diff -r 619699f48fc9 -r 34e22c3c0bf9 docs/wiki/MailboxIntegration
--- a/docs/wiki/MailboxIntegration	Sat Oct 31 01:11:21 2015 +0100
+++ b/docs/wiki/MailboxIntegration	Sat Oct 31 14:31:44 2015 +0100
@@ -47,21 +47,24 @@
 {{{#!table
 '''File''' || '''Purpose'''
 ==
-`890_exim4-config_cyrus_lmtp_local`
+`890_exim4-config_cyrus_lmtp_local_system`
 || Routes messages for local system users to Cyrus
 ==
-`890_exim4-config_dovecot_lmtp_local`
+`890_exim4-config_cyrus_lmtp_local_lmtp`
+|| Routes messages for local virtual users to Cyrus
+==
+`890_exim4-config_dovecot_lmtp_local_system`
 || Routes messages for local system users to Dovecot
 ==
 `890_exim4-config_dovecot_lmtp_local_lmtp`
-|| Routes messages for local virtual users to Dovecot using an `lmtp`
-.. prefix
+|| Routes messages for local virtual users to Dovecot
 }}}
 
 On Debian systems, these files would be copied into the `/etc/exim4/conf.d/router`
 directory. Depending on whether system user identities are to be employed for mail
 or whether genuine virtual identities (not connected to the system) are to be
-employed, one of these files should be selected.
+employed, one type (`local_system` or `local_lmtp`) of these files should be
+selected.
 
 == Postfix ==