Simply exim config slightly by checking for roles in manifest

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 1fb18d6..e5b051b 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,12 @@
 class exim {
 
+       $is_mailrelay = has_role('mailrelay')
+       $is_bugsmaster = has_role('bugsmaster')
+       $is_bugsmx = has_role('bugsmx')
+       $is_rtmaster = has_role('rtmaster')
+       $is_packagesmaster = has_role('packagesmaster')
+       $is_packagesqamaster = has_role('packagesqamaster')
+
        include exim::vdomain::setup
 
        munin::check { 'ps_exim4': script => 'ps_' }
@@ -35,11 +42,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,
@@ -146,11 +150,12 @@ class exim {
                domain      => 'ip6',
                rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
        }
-       dnsextras::entry{ "tlsa-mailport":
-               zone => 'debian.org',
-               label => "_${mail_port}._tcp.${::fqdn}",
-               rrtype => 'TXT',
-               rrdata => 'testing' }
+       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,
@@ -161,4 +166,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
+       }
 }