From 3b53492755b2cfe17d6fc7d29ae6664e2067ebf0 Mon Sep 17 00:00:00 2001
From: Jeremy Stanley <fungi@yuggoth.org>
Date: Mon, 25 Jun 2018 18:17:46 +0000
Subject: [PATCH] Check "cyrus" Exim router before "localuser"

If Exim checks the default "localuser" router before our custom
"cyrus" router, then the lpmqtt account's messages will get
delivered to its system mbox rather than its Cyrus IMAP inbox. To
fix this ordering problem, disable the default localuser router and
define our own after cyrus.

Change-Id: I08b024f1b4097bf651b4c3ed97a319f579869ce4
Depends-On: https://review.openstack.org/577893
---
 modules/openstack_project/manifests/firehose.pp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/openstack_project/manifests/firehose.pp b/modules/openstack_project/manifests/firehose.pp
index eebdc4d61c..534afa27c9 100644
--- a/modules/openstack_project/manifests/firehose.pp
+++ b/modules/openstack_project/manifests/firehose.pp
@@ -72,6 +72,7 @@ class openstack_project::firehose (
   class {'::exim':
     sysadmins => $sysadmins,
     local_domains => "@:firehose.openstack.org",
+    default_localuser_router => false,
     routers  => [
       {'cyrus' => {
         'driver'                     => 'accept',
@@ -79,6 +80,12 @@ class openstack_project::firehose (
         'local_part_suffix'          => '+*',
         'local_part_suffix_optional' => true,
         'transport'                  => 'cyrus',
+      }},
+      {'localuser' => {
+        'driver'               => 'accept',
+        'check_local_user'     => true,
+        'transport'            => 'local_delivery',
+        'cannot_route_message' => 'Unknown user',
       }}
     ],
     transports => [