X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=ae732057f265d0dc65315c1a4845da14840fa535;hb=249b713a08d35bffb1cd52739be6f5808baa5a5f;hp=958a8416953c3910eb2e98e1a1988d82972fd8f9;hpb=ecb65d58f22abe563971da4c5beaf2460c1ab6e5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 958a84169..ae732057f 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_' }
@@ -36,13 +43,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',
-		purge  => true,
-		ignore => '.git',
+		force   => true,
 	}
 	file { '/etc/exim4/conf.d':
 		ensure  => directory,
@@ -53,7 +54,7 @@ class exim {
 	}
 	file { '/etc/exim4/ssl':
 		ensure  => directory,
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0750',
 		purge   => true,
 	}
@@ -109,28 +110,28 @@ class exim {
 	}
 	file { '/etc/exim4/ssl/thishost.crt':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/thishost.key':
 		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crt':
 		source  => 'puppet:///modules/exim/certs/ca.crt',
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crl':
 		source  => 'puppet:///modules/exim/certs/ca.crl',
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/var/log/exim4':
 		ensure  => directory,
 		mode    => '2750',
-		owner   => Debian-exim,
+		owner   => 'Debian-exim',
 		group   => maillog,
 	}
 
@@ -149,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
@@ -165,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
+	}
 }