X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=9f362243fc08e28f3f6b7bde38c1e2b66c3bd804;hb=b1c57d74d65300c3a0ab989cd820a0a19022c427;hp=e133db8643b862dee29ae6b8eadf89d31c6a2537;hpb=8a521b84f203f89c17f65f8b7a550be088cc6764;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index e133db864..9f362243f 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -36,11 +36,14 @@ class exim {
 	}
 	file { '/etc/exim4/Git':
 		ensure  => absent,
+		force   => true,
 	}
-        # git checkouts through puppet.  yummy.
+	# 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,
@@ -147,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
@@ -163,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
+	}
 }