Check out email-virtualdomains using git, not through puppet itself

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index 727a097b1e2b3b34f5022f6ae33e2d95517dea66..222b805112852868297ce9b14a13d137cdb00ed5 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -28,6 +28,9 @@ class exim {
                ]
        }
 
+       file { '/etc/cron.d/dsa-email-virtualdomains':
+               source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+       }
        file { '/etc/exim4/':
                ensure  => directory,
                mode    => '0755',
@@ -38,13 +41,6 @@ class exim {
                ensure  => absent,
                force   => true,
        }
-        # git checkouts through puppet.  yummy.
-       file { '/etc/exim4/email-virtualdomains':
-               recurse => true,
-               source => 'puppet:///modules/exim/email-virtualdomains',
-               purge  => true,
-               ignore => '.git',
-       }
        file { '/etc/exim4/conf.d':
                ensure  => directory,
                purge   => true,
@@ -150,11 +146,11 @@ class exim {
                domain      => 'ip6',
                rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
        }
-       dnsextras::tlsa_record{ "tlsa-mailport":
-               zone => 'debian.org',
+       dnsextras::tlsa_record{ 'tlsa-mailport':
+               zone     => 'debian.org',
                certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt",
-               port => "$mail_port",
-               hostname => "$::fqdn",
+               port     => $mail_port,
+               hostname => $::fqdn,
        }
 
        # Do we actually want this?  I'm only doing it because it's harmless
@@ -166,4 +162,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
+       }
 }