From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 21 Sep 2019 22:15:33 +0000 (+0200)
Subject: Even heavy_exim hosts can get their system mail from relays
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=d4b801b19d791d14ec86099d36770e572ea7d2e5;p=mirror%2Fdsa-puppet.git

Even heavy_exim hosts can get their system mail from relays
---

diff --git a/modules/roles/manifests/mta.pp b/modules/roles/manifests/mta.pp
index 486f3e954..e85c444c6 100644
--- a/modules/roles/manifests/mta.pp
+++ b/modules/roles/manifests/mta.pp
@@ -11,14 +11,17 @@ class roles::mta(
   if $type == 'exim4' {
     if $mailrelay {
       include roles::mailrelay
-    } elsif $heavy {
-      include exim::mx
     } else {
-      include exim
+      if $heavy {
+        include exim::mx
+      } else {
+        include exim
+      }
 
       $mxdata = dig($deprecated::nodeinfo, 'ldap', 'mXRecord')
       if $mxdata and $mxdata.any |$item| { $item =~ /INCOMING-MX/ } {
-        $mailport = lookup('exim::mail_port')
+        $mailport = lookup( { 'name' => 'exim::mail_port', 'default_value' => undef } )
+
 
         @@concat::fragment { "manualroute-to-${::fqdn}":
           tag     => 'exim::manualroute::to::mailrelay',