X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=8b47024134340625cef93003cd6049123f9ebbbf;hb=4bf5791bc77c4f106326c0fab7b971278bd6cf14;hp=4ff0fb1e25c5c32581c5f106eb609fd1b07a73d9;hpb=5c13dcfa7425fbed3e3a7471ce92c2ed15829c7b;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 4ff0fb1e2..8b4702413 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,13 +1,13 @@
 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
+	include debian_org::mail_incoming_port
 
 	munin::check { 'ps_exim4': script => 'ps_' }
 	munin::check { 'exim_mailqueue': }
@@ -135,28 +135,6 @@ class exim {
 		group   => maillog,
 	}
 
-	case getfromhash($site::nodeinfo, 'mail_port') {
-		/^(\d+)$/: { $mail_port = $1 }
-		default: { $mail_port = '25' }
-	}
-
-	@ferm::rule { 'dsa-exim':
-		description => 'Allow SMTP',
-		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)"
-	}
-	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,
 	# though.