X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=462875350f8c482f2d0fc81fe3137531d180c371;hb=53d4eeef534be151a7194e0a43b75879e205a01f;hp=38a77a8eb53796d214b676a060e41fa52273747f;hpb=7c68fc7865be858b7a011a662697d752a5d23e8b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 38a77a8eb..462875350 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,9 +12,20 @@ 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'],
+		require => [
+			File['/etc/exim4/exim4.conf'],
+			Package['exim4-daemon-heavy'],
+		]
 	}
 
 	file { '/etc/exim4/':
@@ -22,11 +35,8 @@ class exim {
 		purge   => true,
 	}
 	file { '/etc/exim4/Git':
-		ensure  => directory,
-		purge   => true,
+		ensure  => absent,
 		force   => true,
-		recurse => true,
-		source  => 'puppet:///files/empty/',
 	}
 	file { '/etc/exim4/conf.d':
 		ensure  => directory,
@@ -43,6 +53,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':
@@ -54,9 +65,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'),
 	}
@@ -122,18 +130,24 @@ class exim {
 
 	case getfromhash($site::nodeinfo, 'mail_port') {
 		/^(\d+)$/: { $mail_port = $1 }
-		default: { $mail_port = 'smtp' }
+		default: { $mail_port = '25' }
 	}
 
 	@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)"
+	}
+	dnsextras::tlsa_record{ 'tlsa-mailport':
+		zone     => 'debian.org',
+		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
+		port     => $mail_port,
+		hostname => $::fqdn,
 	}
 
 	# Do we actually want this?  I'm only doing it because it's harmless
@@ -145,4 +159,17 @@ class exim {
 		rule        => '&SERVICE(tcp, 113)'
 	}
 
+	# These only affect the alias @$fqdn, not say, @debian.org
+
+	mailalias { [
+		'postmaster',
+		'hostmaster',
+		'usenet',
+		'webmaster',
+		'abuse',
+		'noc',
+		'security',
+	]:
+		ensure => absent
+	}
 }