X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=e5b051b2590e0d1488b6f7c2516c46230411fb6c;hb=7125f653d50c51fcf7c2e4bfe8022ef453cd5b33;hp=6b83cf876db3a58e532c22d1623ae8265a3bee10;hpb=6ed6f3ef190ee312064735c2514502ae4fefb135;p=dsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 6b83cf87..e5b051b2 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,14 @@
 class exim {
 
+	$is_mailrelay = has_role('mailrelay')
+	$is_bugsmaster = has_role('bugsmaster')
+	$is_bugsmx = has_role('bugsmx')
+	$is_rtmaster = has_role('rtmaster')
+	$is_packagesmaster = has_role('packagesmaster')
+	$is_packagesqamaster = has_role('packagesqamaster')
+
+	include exim::vdomain::setup
+
 	munin::check { 'ps_exim4': script => 'ps_' }
 	munin::check { 'exim_mailqueue': }
 	munin::check { 'exim_mailstats': }
@@ -10,11 +19,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'],
 		]
 	}
 
@@ -25,11 +42,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,
@@ -58,9 +72,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'),
 	}
@@ -126,7 +137,7 @@ class exim {
 
 	case getfromhash($site::nodeinfo, 'mail_port') {
 		/^(\d+)$/: { $mail_port = $1 }
-		default: { $mail_port = 'smtp' }
+		default: { $mail_port = '25' }
 	}
 
 	@ferm::rule { 'dsa-exim':
@@ -139,6 +150,12 @@ class exim {
 		domain      => 'ip6',
 		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
 	# and makes the logs quiet.  There are better ways of making logs quiet,
@@ -149,4 +166,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
+	}
 }