# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1445444931 -7200
# Node ID 6cc2fe1118b4ecbc8ab7498c23b81111a240ba5f
# Parent  80b0809964e626d10c8ca17f98d020d56f9e26d0
Changed the priority of configuration files.
Made the local people router use a redirect driver.

diff -r 80b0809964e6 -r 6cc2fe1118b4 README.txt
--- a/README.txt	Wed Oct 21 18:26:51 2015 +0200
+++ b/README.txt	Wed Oct 21 18:28:51 2015 +0200
@@ -142,8 +142,8 @@
 
   010_exim4-config_people_outgoing          Defines recipients and outgoing
                                             mail routing
-  890_exim4-config_ldap_people              ...
-  890_exim4-config_ldap_resources           ...
+  010_exim4-config_ldap_people              ...
+  010_exim4-config_ldap_resources           ...
 
 For Postfix with LDAP (in conf/postfix/ldap)...
 
@@ -163,8 +163,8 @@
 
   010_exim4-config_people_outgoing          Defines recipients and outgoing
                                             mail routing
-  890_exim4-config_ldap_people              ...
-  890_exim4-config_ldap_resources           ...
+  010_exim4-config_ldap_people              ...
+  010_exim4-config_ldap_resources           ...
 
   virtual_people                            Defines recipient identities
   virtual_resources                         belonging to known domains
diff -r 80b0809964e6 -r 6cc2fe1118b4 conf/exim/simple/010_exim4-config_people
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/simple/010_exim4-config_people	Wed Oct 21 18:28:51 2015 +0200
@@ -0,0 +1,7 @@
+simple_person:
+  debug_print = "R: simple_person for $local_part@$domain"
+  driver = accept
+  domains = lsearch;/etc/exim4/virtual_domains
+  local_parts = lsearch;/etc/exim4/virtual_people
+  transport = people_transport
+  cannot_route_message = Unknown user
diff -r 80b0809964e6 -r 6cc2fe1118b4 conf/exim/simple/010_exim4-config_people_local
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/simple/010_exim4-config_people_local	Wed Oct 21 18:28:51 2015 +0200
@@ -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}}
+  cannot_route_message = Unknown user
diff -r 80b0809964e6 -r 6cc2fe1118b4 conf/exim/simple/010_exim4-config_resources
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/simple/010_exim4-config_resources	Wed Oct 21 18:28:51 2015 +0200
@@ -0,0 +1,7 @@
+simple_resource:
+  debug_print = "R: simple_resource for $local_part@$domain"
+  driver = accept
+  domains = lsearch;/etc/exim4/virtual_domains
+  local_parts = lsearch;/etc/exim4/virtual_resources
+  transport = resources_transport
+  cannot_route_message = Unknown user
diff -r 80b0809964e6 -r 6cc2fe1118b4 conf/exim/simple/890_exim4-config_people
--- a/conf/exim/simple/890_exim4-config_people	Wed Oct 21 18:26:51 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-simple_person:
-  debug_print = "R: simple_person for $local_part@$domain"
-  driver = accept
-  domains = lsearch;/etc/exim4/virtual_domains
-  local_parts = lsearch;/etc/exim4/virtual_people
-  transport = people_transport
-  cannot_route_message = Unknown user
diff -r 80b0809964e6 -r 6cc2fe1118b4 conf/exim/simple/890_exim4-config_resources
--- a/conf/exim/simple/890_exim4-config_resources	Wed Oct 21 18:26:51 2015 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-simple_resource:
-  debug_print = "R: simple_resource for $local_part@$domain"
-  driver = accept
-  domains = lsearch;/etc/exim4/virtual_domains
-  local_parts = lsearch;/etc/exim4/virtual_resources
-  transport = resources_transport
-  cannot_route_message = Unknown user
diff -r 80b0809964e6 -r 6cc2fe1118b4 conf/exim/simple/virtual_people_local
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/exim/simple/virtual_people_local	Wed Oct 21 18:28:51 2015 +0200
@@ -0,0 +1,2 @@
+local+paul.boddie: paulb
+local+vincent.vole: vole
diff -r 80b0809964e6 -r 6cc2fe1118b4 conf/exim/simple/virtual_people_outgoing
--- a/conf/exim/simple/virtual_people_outgoing	Wed Oct 21 18:26:51 2015 +0200
+++ b/conf/exim/simple/virtual_people_outgoing	Wed Oct 21 18:28:51 2015 +0200
@@ -1,2 +1,4 @@
+people-outgoing+paul.boddie@example.com:
+people-outgoing+vincent.vole@example.com:
 paul.boddie@example.com:
 vincent.vole@example.com: