projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Create an exim::manualroute define
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
mta.pp
diff --git
a/modules/roles/manifests/mta.pp
b/modules/roles/manifests/mta.pp
index
511a00b
..
9044803
100644
(file)
--- 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
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',
@@ferm::rule::simple { "submission-from-${::fqdn}":
tag => 'smtp::server::submission::to::mail-relay',