X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fmta.pp;h=2a783b48035b07ac4d4622be50fa7f9fa57d2f84;hb=1025496ebccd1d943ad0dddf58d4bee574be1464;hp=486f3e9543a7b133d9729dfb4b6cce017cd6e07a;hpb=8e4a1f6532c3108b1907558d68d6999b2d741c3a;p=mirror%2Fdsa-puppet.git

diff --git a/modules/roles/manifests/mta.pp b/modules/roles/manifests/mta.pp
index 486f3e954..2a783b480 100644
--- a/modules/roles/manifests/mta.pp
+++ b/modules/roles/manifests/mta.pp
@@ -15,20 +15,6 @@ class roles::mta(
       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')
-
-        @@concat::fragment { "manualroute-to-${::fqdn}":
-          tag     => 'exim::manualroute::to::mailrelay',
-          target  => '/etc/exim4/manualroute-new',
-          content => $mailport == undef ? {
-            true    => "${::fqdn}:   ${::fqdn}",
-            default => "${::fqdn}:   ${::fqdn}::${mailport}",
-          }
-        }
-      }
     }
   } elsif $type == 'postfix' {
     if $mailrelay {
@@ -38,4 +24,26 @@ class roles::mta(
   } else {
     fail("Unexpected mta type ${type}")
   }
+
+
+  $mxdata = dig($deprecated::nodeinfo, 'ldap', 'mXRecord')
+  if $mxdata and $mxdata.any |$item| { $item =~ /INCOMING-MX/ } {
+    $mailport = lookup( { 'name' => 'exim::mail_port', 'default_value' => undef } )
+
+    @@concat::fragment { "manualroute-to-${::fqdn}":
+      tag     => 'exim::manualroute::to::mailrelay',
+      target  => '/etc/exim4/manualroute',
+      content => $mailport == undef ? {
+        true    => "${::fqdn}:   ${::fqdn}",
+        default => "${::fqdn}:   ${::fqdn}::${mailport}",
+      }
+    }
+
+    Ferm::Rule::Simple <<| tag == 'smtp::server::from::mailrelay' |>> {
+      port => $mailport == undef ? {
+        true    => 25,
+        default => $mailport,
+      }
+    }
+  }
 }