prosody: posix_acl is fighting with the prosody module about proper modes; remove...

[mirror/dsa-puppet.git] / modules / exim / manifests / mailrelay.pp

diff --git a/modules/exim/manifests/mailrelay.pp b/modules/exim/manifests/mailrelay.pp
index 09afd67..9d0f625 100644 (file)
--- a/modules/exim/manifests/mailrelay.pp
+++ b/modules/exim/manifests/mailrelay.pp
@@ -10,14 +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
   }
+  concat::fragment { 'virtual_domain_template':
+    target  => '/etc/exim4/virtualdomains',
+    content => template('exim/virtualdomains-mailrelay.erb'),
+  }
 
-
-  concat { '/etc/exim4/manualroute-new':
+  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' |>>
 }