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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 096100da..10c449e7 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -133,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':
@@ -146,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,