Only put dsa-email-virtualdomains on the MX-es, not all machines

[dsa-puppet.git] / modules / exim / manifests / mx.pp

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 70a370294b9c17b90b99ccbefdea8299eea7adea..e035abb73580f86139e26d282a0dc67f66622ab0 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -13,6 +13,7 @@ class exim::mx inherits exim {
                notify  => Service['exim4'],
        }
 
+       # MXs used as smarthosts
        @ferm::rule { 'dsa-exim-submission':
                description => 'Allow SMTP',
                rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
@@ -22,5 +23,17 @@ class exim::mx inherits exim {
                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,
+       }
 
+       file { '/etc/cron.d/dsa-email-virtualdomains':
+               source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+       }
 }