X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=222b805112852868297ce9b14a13d137cdb00ed5;hb=0f81c0baea06f2ec09b3b4ce73556cd323a6b697;hp=eac2462c5946d4c07c273cd1044656cf62c97287;hpb=1fb10bb467fcfcdd63cbaa485aee9b0f5128dfcd;p=dsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index eac2462c..222b8051 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -28,6 +28,9 @@ class exim {
 		]
 	}
 
+	file { '/etc/cron.d/dsa-email-virtualdomains':
+		source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+	}
 	file { '/etc/exim4/':
 		ensure  => directory,
 		mode    => '0755',
@@ -36,10 +39,7 @@ class exim {
 	}
 	file { '/etc/exim4/Git':
 		ensure  => absent,
-	# git checkouts through puppet.  yummy.
-	file { '/etc/exim4/email-virtualdomains':
-		recurse => true,
-		source => 'puppet:///modules/exim/email-virtualdomains',
+		force   => true,
 	}
 	file { '/etc/exim4/conf.d':
 		ensure  => directory,
@@ -146,11 +146,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
@@ -162,4 +162,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
+	}
 }