X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=096100da55dc6ecb59703215510ca850b66d6490;hb=34017d07929662aa40a511cf9993cbf33a70ace7;hp=a9529ca1a78cb7abc564055026c84eb74c7bf407;hpb=f7520dd7a96a98693c62480afd1ca7d8cf87a8e4;p=dsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index a9529ca1..096100da 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,7 @@
 class exim {
 
+	include exim::vdomain::setup
+
 	munin::check { 'ps_exim4': script => 'ps_' }
 	munin::check { 'exim_mailqueue': }
 	munin::check { 'exim_mailstats': }
@@ -12,6 +14,12 @@ class exim {
 
 	Package['exim4-daemon-heavy']->Mailalias<| |>
 
+	concat::fragment { 'virtual_domain_template':
+		target  => '/etc/exim4/virtualdomains',
+		content => template('exim/virtualdomains.erb'),
+		order   => 05,
+	}
+
 	service { 'exim4':
 		ensure  => running,
 		require => [
@@ -60,9 +68,6 @@ class exim {
 	file { '/etc/exim4/locals':
 		content => template('exim/locals.erb')
 	}
-	file { '/etc/exim4/virtualdomains':
-		content => template('exim/virtualdomains.erb'),
-	}
 	file { '/etc/exim4/submission-domains':
 		content => template('exim/submission-domains.erb'),
 	}