X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=10c449e704fc68ce020a3b49567f823cd68ea98c;hb=b41bbe0bcc0ca74548ff8e99c3014452a7dc64f2;hp=a9529ca1a78cb7abc564055026c84eb74c7bf407;hpb=612a82cea6db3e7efd8d387259828672e97b7ac5;p=dsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index a9529ca1..10c449e7 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'),
 	}
@@ -128,7 +133,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':
@@ -141,6 +146,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,