Move all roles from local.yaml to hiera

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

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index c1b4fdbca3afc289dac07dbf90749fa0d04c34e3..54f1933b3c5c3586e801319da3b1fd91fe429776 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -13,14 +13,33 @@ 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)'
+               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)',
+               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,
        }
 
+       if has_role('mailrelay') {
+               file { '/etc/cron.d/dsa-email-virtualdomains':
+                       source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+               }
+       } else {
+               file { '/etc/cron.d/dsa-email-virtualdomains':
+                       ensure => absent,
+               }
+       }
 }