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

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 096100da55dc6ecb59703215510ca850b66d6490..462875350f8c482f2d0fc81fe3137531d180c371 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -35,11 +35,8 @@ class exim {
                purge   => true,
        }
        file { '/etc/exim4/Git':
-               ensure  => directory,
-               purge   => true,
+               ensure  => absent,
                force   => true,
-               recurse => true,
-               source  => 'puppet:///files/empty/',
        }
        file { '/etc/exim4/conf.d':
                ensure  => directory,
@@ -133,7 +130,7 @@ class exim {
 
        case getfromhash($site::nodeinfo, 'mail_port') {
                /^(\d+)$/: { $mail_port = $1 }
-               default: { $mail_port = 'smtp' }
+               default: { $mail_port = '25' }
        }
 
        @ferm::rule { 'dsa-exim':
@@ -146,6 +143,12 @@ class exim {
                domain      => 'ip6',
                rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
        }
+       dnsextras::tlsa_record{ 'tlsa-mailport':
+               zone     => 'debian.org',
+               certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
+               port     => $mail_port,
+               hostname => $::fqdn,
+       }
 
        # Do we actually want this?  I'm only doing it because it's harmless
        # and makes the logs quiet.  There are better ways of making logs quiet,
@@ -156,4 +159,17 @@ class exim {
                rule        => '&SERVICE(tcp, 113)'
        }
 
+       # These only affect the alias @$fqdn, not say, @debian.org
+
+       mailalias { [
+               'postmaster',
+               'hostmaster',
+               'usenet',
+               'webmaster',
+               'abuse',
+               'noc',
+               'security',
+       ]:
+               ensure => absent
+       }
 }