Apply a bigger hammer to get rid of /etc/exim4/Git

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 1fb18d6f985f410c057d286b90f6788b2373737e..727a097b1e2b3b34f5022f6ae33e2d95517dea66 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -35,11 +35,15 @@ class exim {
                purge   => true,
        }
        file { '/etc/exim4/Git':
-               ensure  => directory,
-               purge   => true,
+               ensure  => absent,
                force   => true,
+       }
+        # git checkouts through puppet.  yummy.
+       file { '/etc/exim4/email-virtualdomains':
                recurse => true,
-               source  => 'puppet:///files/empty/',
+               source => 'puppet:///modules/exim/email-virtualdomains',
+               purge  => true,
+               ignore => '.git',
        }
        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":
+       dnsextras::tlsa_record{ "tlsa-mailport":
                zone => 'debian.org',
-               label => "_${mail_port}._tcp.${::fqdn}",
-               rrtype => 'TXT',
-               rrdata => 'testing' }
+               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,