X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fmx.pp;h=f719e628c2c996c95b89ef2f9c1f0c8970fc904a;hb=b1c57d74d65300c3a0ab989cd820a0a19022c427;hp=8a81592eca96f0f1f449de4c8e384a5bb3d6e39e;hpb=70a9bda9ef6e5fa2cebded47c59a11a2592c5511;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 8a81592ec..f719e628c 100644
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,37 +1,35 @@
 class exim::mx inherits exim {
-    include clamav
-    include postgrey
+	include clamav
+	include postgrey
 
-    file {
-        "/etc/exim4/ccTLD.txt":
-          require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///modules/exim/common/ccTLD.txt" ]
-          ;
-        "/etc/exim4/surbl_whitelist.txt":
-          require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///modules/exim/common/surbl_whitelist.txt" ]
-          ;
-        "/etc/exim4/exim_surbl.pl":
-          require => Package["exim4-daemon-heavy"],
-          source  => [ "puppet:///modules/exim/common/exim_surbl.pl" ],
-          notify  => Exec["exim4 restart"]
-          ;
-    }
-    exec { "exim4 restart":
-        path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
-        refreshonly => true,
-    }
-    @ferm::rule { "dsa-exim-submission":
-            description     => "Allow SMTP",
-            rule            => "&SERVICE_RANGE(tcp, submission, \$SMTP_SOURCES)"
-    }
-    @ferm::rule { "dsa-exim-v6-submission":
-            description     => "Allow SMTP",
-            domain          => "ip6",
-            rule            => "&SERVICE_RANGE(tcp, submission, \$SMTP_V6_SOURCES)"
-    }
-}
+	file { '/etc/exim4/ccTLD.txt':
+		source => 'puppet:///modules/exim/common/ccTLD.txt',
+	}
+	file { '/etc/exim4/surbl_whitelist.txt':
+		source => 'puppet:///modules/exim/common/surbl_whitelist.txt',
+	}
+	file { '/etc/exim4/exim_surbl.pl':
+		source  => 'puppet:///modules/exim/common/exim_surbl.pl',
+		notify  => Service['exim4'],
+	}
 
-# vim:set et:
-# vim:set sts=4 ts=4:
-# vim:set shiftwidth=4:
+	# MXs used as smarthosts
+	@ferm::rule { 'dsa-exim-submission':
+		description => 'Allow SMTP',
+		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
+	}
+	@ferm::rule { 'dsa-exim-v6-submission':
+		description => 'Allow SMTP',
+		domain      => 'ip6',
+		rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
+	}
+	dnsextras::tlsa_record{ "tlsa-submission":
+		zone => 'debian.org',
+		certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
+		port => 587,
+		hostname => "$::fqdn",
+	}
+	package { 'nagios-plugins-standard':
+		ensure => installed,
+	}
+}