From: Peter Palfrader <peter@palfrader.org>
Date: Sun, 22 Sep 2019 07:17:35 +0000 (+0200)
Subject: Disable manualroute-new and prepare for collecting the new file as manualroute
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=1025496ebccd1d943ad0dddf58d4bee574be1464;hp=7f40568b97518e7199911f28804d5fdf9e3405e4;p=mirror%2Fdsa-puppet.git

Disable manualroute-new and prepare for collecting the new file as manualroute
---

diff --git a/modules/exim/manifests/mailrelay.pp b/modules/exim/manifests/mailrelay.pp
index 09afd67dd..842d4da90 100644
--- a/modules/exim/manifests/mailrelay.pp
+++ b/modules/exim/manifests/mailrelay.pp
@@ -12,12 +12,15 @@ class exim::mailrelay {
   }
 
 
-  concat { '/etc/exim4/manualroute-new':
-    mode           => '0444',
-    ensure_newline => true,
-    warn           => '# This file is maintained with puppet',
-    require        => Package['exim4-daemon-heavy']
+  file { '/etc/exim4/manualroute-new':
+    ensure => absent,
   }
+  #concat { '/etc/exim4/manualroute-new':
+  #  mode           => '0444',
+  #  ensure_newline => true,
+  #  warn           => '# This file is maintained with puppet',
+  #  require        => Package['exim4-daemon-heavy']
+  #}
 
-  Concat::Fragment <<| tag == 'exim::manualroute::to::mailrelay' |>>
+  #Concat::Fragment <<| tag == 'exim::manualroute::to::mailrelay' |>>
 }
diff --git a/modules/roles/manifests/mta.pp b/modules/roles/manifests/mta.pp
index c70224dae..2a783b480 100644
--- 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',
-      target  => '/etc/exim4/manualroute-new',
+      target  => '/etc/exim4/manualroute',
       content => $mailport == undef ? {
         true    => "${::fqdn}:   ${::fqdn}",
         default => "${::fqdn}:   ${::fqdn}::${mailport}",