Decommission zemlinsky.d.o (RT#7208)

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

diff --git a/modules/exim/manifests/mx.pp b/modules/exim/manifests/mx.pp
index c1b4fdb..cddf405 100644 (file)
--- a/modules/exim/manifests/mx.pp
+++ b/modules/exim/manifests/mx.pp
@@ -13,14 +13,34 @@ 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)',
+       }
+       $autocertdir = hiera('paths.auto_certs_dir')
+       dnsextras::tlsa_record{ "tlsa-submission":
+               zone => 'debian.org',
+               certfile => "${autocertdir}/${::fqdn}.crt",
+               port => 587,
+               hostname => "$::fqdn",
+       }
+       package { 'nagios-plugins-standard':
+               ensure => installed,
        }
 
+       if has_role('mailrelay') {
+               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, }
 }