nagios-plugins-standard was renamed to monitoring-plugins-standard in 2014

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

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index 9b5bf4b..f1ea5bb 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',
@@ -23,23 +24,24 @@ class exim::mx inherits exim {
                domain      => 'ip6',
                rule        => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
        }
+       $autocertdir = hiera('paths.auto_certs_dir')
        dnsextras::tlsa_record{ "tlsa-submission":
                zone => 'debian.org',
-               certfile => "/etc/puppet/modules/ssl/files/auto-certs/${::fqdn}.crt",
+               certfile => "${autocertdir}/${::fqdn}.crt",
                port => 587,
                hostname => "$::fqdn",
        }
-       package { 'nagios-plugins-standard':
+       package { 'monitoring-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,
+               concat::fragment { 'dsa-puppet-stuff--email-virtualdomains':
+                       target => '/etc/cron.d/dsa-puppet-stuff',
+                       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
                }
        }
+       file { '/etc/cron.d/dsa-email-virtualdomains': ensure => absent, }
 }