X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=abe0237057178ca5435774aa711f30e8dd5a646b;hb=a0ae58f07e1d5e2ed987ef4c50e559534796e300;hp=e18f0aab5b20c586149a07bb3d2e8622b4ae1edf;hpb=3eb533e5499e66423bafdedaf6c7d08ead1772de;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index e18f0aab5..abe023705 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -12,7 +12,10 @@ class exim {
 
 	service { 'exim4':
 		ensure  => running,
-		require => File['/etc/exim4/exim4.conf'],
+		require => [
+			File['/etc/exim4/exim4.conf'],
+			Package['exim4-daemon-heavy'],
+		]
 	}
 
 	file { '/etc/exim4/':
@@ -43,6 +46,7 @@ class exim {
 	}
 	file { '/etc/exim4/exim4.conf':
 		content => template('exim/eximconf.erb'),
+		require => File['/etc/exim4/ssl/thishost.crt'],
 		notify  => Service['exim4'],
 	}
 	file { '/etc/mailname':
@@ -58,7 +62,7 @@ class exim {
 		content => template('exim/virtualdomains.erb'),
 	}
 	file { '/etc/exim4/submission-domains':
-		content => template('exim/common/submission-domains.erb'),
+		content => template('exim/submission-domains.erb'),
 	}
 	file { '/etc/exim4/host_blacklist':
 		source => 'puppet:///modules/exim/common/host_blacklist',
@@ -127,18 +131,18 @@ class exim {
 
 	@ferm::rule { 'dsa-exim':
 		description => 'Allow SMTP',
-		rule        => '&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)'
+		rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
 	}
 
 	@ferm::rule { 'dsa-exim-v6':
 		description => 'Allow SMTP',
 		domain      => 'ip6',
-		rule        => '&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)'
+		rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
 	}
 
 	# Do we actually want this?  I'm only doing it because it's harmless
-  # and makes the logs quiet.  There are better ways of making logs quiet,
-  # though.
+	# and makes the logs quiet.  There are better ways of making logs quiet,
+	# though.
 	@ferm::rule { 'dsa-ident':
 		domain      => '(ip ip6)',
 		description => 'Allow ident access',