X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Finit.pp;h=b6cb8290592f5eaaf2e5229d4d69d1fad7bc13d3;hb=225f9f1650b942977fc3e9f5a2e3826108d2b43f;hp=462875350f8c482f2d0fc81fe3137531d180c371;hpb=8bdb11e51dd58922fa1ba71b2c5c8c27bfe44584;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 462875350..b6cb82905 100644
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,6 +1,13 @@
 class exim {
 
+	$is_mailrelay = has_role('mailrelay')
+	$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': }
@@ -17,7 +24,7 @@ class exim {
 	concat::fragment { 'virtual_domain_template':
 		target  => '/etc/exim4/virtualdomains',
 		content => template('exim/virtualdomains.erb'),
-		order   => 05,
+		order   => '05',
 	}
 
 	service { 'exim4':
@@ -34,10 +41,6 @@ class exim {
 		require => Package['exim4-daemon-heavy'],
 		purge   => true,
 	}
-	file { '/etc/exim4/Git':
-		ensure  => absent,
-		force   => true,
-	}
 	file { '/etc/exim4/conf.d':
 		ensure  => directory,
 		purge   => true,
@@ -47,7 +50,7 @@ class exim {
 	}
 	file { '/etc/exim4/ssl':
 		ensure  => directory,
-		group   => Debian-exim,
+		group   => 'Debian-exim',
 		mode    => '0750',
 		purge   => true,
 	}
@@ -102,54 +105,32 @@ class exim {
 		source => 'puppet:///modules/exim/common/logrotate-exim4-paniclog'
 	}
 	file { '/etc/exim4/ssl/thishost.crt':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
-		group   => Debian-exim,
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".crt") %>'),
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/thishost.key':
-		source  => "puppet:///modules/exim/certs/${::fqdn}.key",
-		group   => Debian-exim,
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".key") %>'),
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crt':
-		source  => 'puppet:///modules/exim/certs/ca.crt',
-		group   => Debian-exim,
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crt") %>'),
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/etc/exim4/ssl/ca.crl':
-		source  => 'puppet:///modules/exim/certs/ca.crl',
-		group   => Debian-exim,
+		content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crl") %>'),
+		group   => 'Debian-exim',
 		mode    => '0640',
 	}
 	file { '/var/log/exim4':
 		ensure  => directory,
 		mode    => '2750',
-		owner   => Debian-exim,
+		owner   => 'Debian-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.