X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=e5b051b2590e0d1488b6f7c2516c46230411fb6c;hb=0ddec3cf101140def15c2d0b7d608141a82e38f3;hp=727a097b1e2b3b34f5022f6ae33e2d95517dea66;hpb=c3cbc47d1383ae2e770c6af002d1c12aafa337af;p=dsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 727a097b..e5b051b2 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,12 @@
 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_' }
@@ -38,13 +45,6 @@ class exim {
 		ensure  => absent,
 		force   => true,
 	}
-        # git checkouts through puppet.  yummy.
-	file { '/etc/exim4/email-virtualdomains':
-		recurse => true,
-		source => 'puppet:///modules/exim/email-virtualdomains',
-		purge  => true,
-		ignore => '.git',
-	}
 	file { '/etc/exim4/conf.d':
 		ensure  => directory,
 		purge   => true,
@@ -150,11 +150,11 @@ class exim {
 		domain      => 'ip6',
 		rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
 	}
-	dnsextras::tlsa_record{ "tlsa-mailport":
-		zone => 'debian.org',
+	dnsextras::tlsa_record{ 'tlsa-mailport':
+		zone     => 'debian.org',
 		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
-		port => "$mail_port",
-		hostname => "$::fqdn",
+		port     => $mail_port,
+		hostname => $::fqdn,
 	}
 
 	# Do we actually want this?  I'm only doing it because it's harmless
@@ -166,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
+	}
 }