X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmailrelay.pp;h=9d0f625776a9d95660ac3551b66ffdc9a84ddc41;hb=7a10c64995530d782139c05bbe4955ec1e4a180b;hp=842d4da909f39e23dfd25c98e388e161d5ebc286;hpb=1025496ebccd1d943ad0dddf58d4bee574be1464;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mailrelay.pp b/modules/exim/manifests/mailrelay.pp
index 842d4da90..9d0f62577 100644
--- a/modules/exim/manifests/mailrelay.pp
+++ b/modules/exim/manifests/mailrelay.pp
@@ -10,17 +10,16 @@ class exim::mailrelay {
       @hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only
       | EOF
   }
-
-
-  file { '/etc/exim4/manualroute-new':
-    ensure => absent,
+  concat::fragment { 'virtual_domain_template':
+    target  => '/etc/exim4/virtualdomains',
+    content => template('exim/virtualdomains-mailrelay.erb'),
   }
-  #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 { '/etc/exim4/manualroute':
+    mode           => '0444',
+    ensure_newline => true,
+    warn           => '# This file is maintained with puppet',
+    require        => Package['exim4-daemon-heavy']
+  }
+  Concat::Fragment <<| tag == 'exim::manualroute::to::mailrelay' |>>
 }