projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disable manualroute-new and prepare for collecting the new file as manualroute
[mirror/dsa-puppet.git]
/
modules
/
roles
/
manifests
/
mta.pp
diff --git
a/modules/roles/manifests/mta.pp
b/modules/roles/manifests/mta.pp
index
c70224d
..
2a783b4
100644
(file)
--- a/
modules/roles/manifests/mta.pp
+++ b/
modules/roles/manifests/mta.pp
@@
-32,7
+32,7
@@
class roles::mta(
@@concat::fragment { "manualroute-to-${::fqdn}":
tag => 'exim::manualroute::to::mailrelay',
@@concat::fragment { "manualroute-to-${::fqdn}":
tag => 'exim::manualroute::to::mailrelay',
- target => '/etc/exim4/manualroute
-new
',
+ target => '/etc/exim4/manualroute',
content => $mailport == undef ? {
true => "${::fqdn}: ${::fqdn}",
default => "${::fqdn}: ${::fqdn}::${mailport}",
content => $mailport == undef ? {
true => "${::fqdn}: ${::fqdn}",
default => "${::fqdn}: ${::fqdn}::${mailport}",