replace modules/nagios/files/dsa-nagios with a symlink to a new install location

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index ae73205..49504e0 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -8,6 +8,7 @@ class exim {
        $is_packagesqamaster = has_role('packagesqamaster')
 
        include exim::vdomain::setup
+       include debian_org::mail_incoming_port
 
        munin::check { 'ps_exim4': script => 'ps_' }
        munin::check { 'exim_mailqueue': }
@@ -24,7 +25,7 @@ class exim {
        concat::fragment { 'virtual_domain_template':
                target  => '/etc/exim4/virtualdomains',
                content => template('exim/virtualdomains.erb'),
-               order   => 05,
+               order   => '05',
        }
 
        service { 'exim4':
@@ -135,28 +136,6 @@ class exim {
                group   => maillog,
        }
 
-       case getfromhash($site::nodeinfo, 'mail_port') {
-               /^(\d+)$/: { $mail_port = $1 }
-               default: { $mail_port = '25' }
-       }
-
-       @ferm::rule { 'dsa-exim':
-               description => 'Allow SMTP',
-               rule        => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
-       }
-
-       @ferm::rule { 'dsa-exim-v6':
-               description => 'Allow SMTP',
-               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,
        # though.