# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1446335019 -3600
# Node ID dbbff7484fea785b4f6b2c142955fd39a4b3675d
# Parent  6195cb90cb0cc1e77e6d4fcec3e361a09a22bee4
Merged the Postfix local SMTP mechanisms, updating the documentation.

diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/ldap/lmtp_generic
--- a/conf/postfix/ldap/lmtp_generic	Sun Nov 01 00:28:31 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/^local+(.*)@example\.com$/ ${1}@example.com
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/ldap/master.cf.items
--- a/conf/postfix/ldap/master.cf.items	Sun Nov 01 00:28:31 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-lmtp      unix  -       -       n       -       -       lmtp
-    -o lmtp_generic_maps=regexp:/etc/postfix/ldap/lmtp_generic
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/ldap/transport.items
--- a/conf/postfix/ldap/transport.items	Sun Nov 01 00:28:31 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# Local delivery to Cyrus:
-#local@example.com               lmtp:unix:/var/run/cyrus/socket/lmtp
-# Local delivery to Dovecot:
-#local@example.com               lmtp:unix:/var/run/dovecot/lmtp
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/lmtp/lmtp_generic
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/postfix/lmtp/lmtp_generic	Sun Nov 01 00:43:39 2015 +0100
@@ -0,0 +1,1 @@
+/^local+(.*)@example\.com$/ ${1}@example.com
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/lmtp/master.cf.items
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/postfix/lmtp/master.cf.items	Sun Nov 01 00:43:39 2015 +0100
@@ -0,0 +1,2 @@
+lmtp      unix  -       -       n       -       -       lmtp
+    -o lmtp_generic_maps=regexp:/etc/postfix/lmtp_generic
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/lmtp/transport.items
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/conf/postfix/lmtp/transport.items	Sun Nov 01 00:43:39 2015 +0100
@@ -0,0 +1,4 @@
+# Local delivery to Cyrus:
+#local@example.com               lmtp:unix:/var/run/cyrus/socket/lmtp
+# Local delivery to Dovecot:
+#local@example.com               lmtp:unix:/var/run/dovecot/lmtp
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/simple/lmtp_generic
--- a/conf/postfix/simple/lmtp_generic	Sun Nov 01 00:28:31 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-/^(.*)@local\.example\.com$/ ${1}@example.com
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/simple/main.cf.example
--- a/conf/postfix/simple/main.cf.example	Sun Nov 01 00:28:31 2015 +0100
+++ b/conf/postfix/simple/main.cf.example	Sun Nov 01 00:43:39 2015 +0100
@@ -1,10 +1,8 @@
-# Uncomment the virtual_alias_maps_local_lmtp entry to support LMTP delivery,
-# or the virtual_alias_maps_local_system entry to support local system user
-# delivery.
+# Uncomment the virtual_alias_maps_local_system entry to support local system
+# user delivery.
 
 virtual_alias_maps = $alias_maps, hash:/etc/postfix/virtual,
                      hash:/etc/postfix/simple/virtual_alias_maps
-                  #, hash:/etc/postfix/simple/virtual_alias_maps_local_lmtp
                   #, hash:/etc/postfix/simple/virtual_alias_maps_local_system
 
 sender_bcc_maps = hash:/etc/postfix/simple/virtual_alias_maps_people_outgoing
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/simple/master.cf.items
--- a/conf/postfix/simple/master.cf.items	Sun Nov 01 00:28:31 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-lmtp      unix  -       -       n       -       -       lmtp
-    -o lmtp_generic_maps=regexp:/etc/postfix/simple/lmtp_generic
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/simple/transport.items
--- a/conf/postfix/simple/transport.items	Sun Nov 01 00:28:31 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-# Local delivery to Cyrus:
-#local.example.com               lmtp:unix:/var/run/cyrus/socket/lmtp
-# Local delivery to Dovecot:
-#local.example.com               lmtp:unix:/var/run/dovecot/lmtp
diff -r 6195cb90cb0c -r dbbff7484fea conf/postfix/simple/virtual_alias_maps_local_lmtp
--- a/conf/postfix/simple/virtual_alias_maps_local_lmtp	Sun Nov 01 00:28:31 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-local+paul.boddie@example.com paul.boddie@local.example.com
-local+vincent.vole@example.com vincent.vole@local.example.com
diff -r 6195cb90cb0c -r dbbff7484fea docs/wiki/MailIntegration--LDAP
--- a/docs/wiki/MailIntegration--LDAP	Sun Nov 01 00:28:31 2015 +0100
+++ b/docs/wiki/MailIntegration--LDAP	Sun Nov 01 00:43:39 2015 +0100
@@ -61,28 +61,6 @@
 `virtual_alias_maps_resources.cf`
 }}}
 
-Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
-files are also useful:
-
-{{{#!table
-'''File''' || '''Purpose'''
-==
-`lmtp_generic`
-|| Configures LMTP delivery for local recipients
-==
-`master.cf.items`
-|| Enables LMTP delivery for local recipients
-==
-`transport.items`
-|| Defines LMTP delivery methods for local recipients
-}}}
-
-These files can be incorporated into the Postfix configuration. On Debian
-systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
-`main.cf.example` can be merged into `/etc/postfix/main.cf`,
-`transport.items` can be merged into `/etc/postfix/transport`,
-whereas the remaining files would be installed into `/etc/postfix/ldap`.
-
 The following files are common to LDAP and [[../Simple|simple]] integration
 and are found in `conf/postfix`:
 
diff -r 6195cb90cb0c -r dbbff7484fea docs/wiki/MailIntegration--Simple
--- a/docs/wiki/MailIntegration--Simple	Sun Nov 01 00:28:31 2015 +0100
+++ b/docs/wiki/MailIntegration--Simple	Sun Nov 01 00:43:39 2015 +0100
@@ -68,33 +68,16 @@
 }}}
 
 Where [[../LocalSMTP|local SMTP routing]] is being performed, the following
-files are also useful:
+file is also useful:
 
 {{{#!table
 '''File''' || '''Purpose'''
 ==
-`lmtp_generic`
-|| Configures LMTP delivery for local recipients
-==
-`master.cf.items`
-|| Enables LMTP delivery for local recipients
-==
-`transport.items`
-|| Defines LMTP delivery methods for local recipients
-==
-`virtual_alias_maps_local_lmtp`
-|| Defines recipients for delivery to mailboxes for virtual users
-==
 `virtual_alias_maps_local_system`
 || Defines recipients for delivery to mailboxes for local system users
+.. (installed into `/etc/postfix/simple`)
 }}}
 
-These files can be incorporated into the Postfix configuration. On Debian
-systems, `master.cf.items` can be merged into `/etc/postfix/master.cf`,
-`main.cf.example` can be merged into `/etc/postfix/main.cf`,
-`transport.items` can be merged into `/etc/postfix/transport`,
-whereas the remaining files would be installed into `/etc/postfix/simple`.
-
 The following files are common to [[../LDAP|LDAP]] and simple integration
 and are found in `conf/postfix`:
 
diff -r 6195cb90cb0c -r dbbff7484fea docs/wiki/MailboxIntegration
--- a/docs/wiki/MailboxIntegration	Sun Nov 01 00:28:31 2015 +0100
+++ b/docs/wiki/MailboxIntegration	Sun Nov 01 00:43:39 2015 +0100
@@ -84,13 +84,17 @@
 {{{#!table
 '''File''' || '''Purpose'''
 ==
-`main.cf.example`
-|| Defines mailbox transports for Cyrus and Dovecot
+`lmtp_generic`
+|| Configures LMTP delivery for local recipients (for installation into
+.. `/etc/postfix`)
 ==
 `master.cf.items`
-|| Defines the LMTP service
+|| Enables LMTP delivery for local recipients
+==
+`transport.items`
+|| Defines LMTP delivery methods for local recipients
 }}}
 
-These files provide example definitions for the `main.cf` and `master.cf`
+These files provide example definitions for the `master.cf` and `transport`
 files that typically reside under `/etc/postfix`. Their contents can be
 merged with those files as appropriate.