X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Froles%2Fmanifests%2Fmta.pp;h=9044803dd5a1e04473e6e9980b745715fa65e742;hb=0300b7631fa167ceec3c38b779d0ba31b20c2b66;hp=511a00b7109f0ff8aca176a2127b7a3b22f2972f;hpb=43becf6c8c3ff70d73c6a0668a0209cb1092192f;p=mirror%2Fdsa-puppet.git diff --git a/modules/roles/manifests/mta.pp b/modules/roles/manifests/mta.pp index 511a00b71..9044803dd 100644 --- a/modules/roles/manifests/mta.pp +++ b/modules/roles/manifests/mta.pp @@ -32,11 +32,7 @@ class roles::mta( if $mxdata and $mxdata.any |$item| { $item =~ /INCOMING-MX/ } { # a mail satellite. Gets mail via the mailrelays and sends out mail via the mail relays - @@concat::fragment { "manualroute-to-${::fqdn}": - tag => 'exim::manualroute::to::mailrelay', - target => '/etc/exim4/manualroute', - content => "${::fqdn}: ${::fqdn}::${mailport}", - } + exim::manualroute{ $::fqdn: } @@ferm::rule::simple { "submission-from-${::fqdn}": tag => 'smtp::server::submission::to::mail-relay',