X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=096100da55dc6ecb59703215510ca850b66d6490;hb=ab25358b289f23003b7b992f926011e5f46bcc6e;hp=6b83cf876db3a58e532c22d1623ae8265a3bee10;hpb=6ed6f3ef190ee312064735c2514502ae4fefb135;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 6b83cf876..096100da5 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': }
@@ -10,11 +12,19 @@ class exim {
 
 	package { 'exim4-daemon-heavy': ensure => installed }
 
+	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 => [
 			File['/etc/exim4/exim4.conf'],
-			Package['exim4'],
+			Package['exim4-daemon-heavy'],
 		]
 	}
 
@@ -58,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'),
 	}