pet -> hiera role; explicitly include apache2

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

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index cddf405..34558a3 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -1,6 +1,7 @@
 class exim::mx inherits exim {
        include clamav
        include postgrey
+       include fail2ban::exim
 
        file { '/etc/exim4/ccTLD.txt':
                source => 'puppet:///modules/exim/common/ccTLD.txt',
@@ -14,11 +15,11 @@ class exim::mx inherits exim {
        }
 
        # MXs used as smarthosts
-       @ferm::rule { 'dsa-exim-submission':
+       ferm::rule { 'dsa-exim-submission':
                description => 'Allow SMTP',
                rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_SOURCES)'
        }
-       @ferm::rule { 'dsa-exim-v6-submission':
+       ferm::rule { 'dsa-exim-v6-submission':
                description => 'Allow SMTP',
                domain      => 'ip6',
                rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
@@ -30,13 +31,13 @@ class exim::mx inherits exim {
                port => 587,
                hostname => "$::fqdn",
        }
-       package { 'nagios-plugins-standard':
+       package { 'monitoring-plugins-standard':
                ensure => installed,
        }
 
        if has_role('mailrelay') {
-               concat::fragment { 'dsa-puppet-stuff--email-virtualdomains':
-                       target => '/etc/cron.d/dsa-puppet-stuff',
+               concat::fragment { 'puppet-crontab--email-virtualdomains':
+                       target => '/etc/cron.d/puppet-crontab',
                        content  => @(EOF)
                                @hourly  root if [ ! -d /etc/exim4/email-virtualdomains ]; then cd /etc/exim4 && git clone mail-git:email-virtualdomains ; fi && cd /etc/exim4/email-virtualdomains && git pull --quiet --ff-only
                                | EOF