Move timeserver from clementi to manda-node04

[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..b6cb829 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,13 +1,13 @@
 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
+       include debian_org::mail_incoming_port
 
        munin::check { 'ps_exim4': script => 'ps_' }
        munin::check { 'exim_mailqueue': }
@@ -24,7 +24,7 @@ class exim {
        concat::fragment { 'virtual_domain_template':
                target  => '/etc/exim4/virtualdomains',
                content => template('exim/virtualdomains.erb'),
-               order   => 05,
+               order   => '05',
        }
 
        service { 'exim4':
@@ -41,10 +41,6 @@ class exim {
                require => Package['exim4-daemon-heavy'],
                purge   => true,
        }
-       file { '/etc/exim4/Git':
-               ensure  => absent,
-               force   => true,
-       }
        file { '/etc/exim4/conf.d':
                ensure  => directory,
                purge   => true,
@@ -109,22 +105,22 @@ class exim {
                source => 'puppet:///modules/exim/common/logrotate-exim4-paniclog'
        }
        file { '/etc/exim4/ssl/thishost.crt':
-               source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".crt") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/thishost.key':
-               source  => "puppet:///modules/exim/certs/${::fqdn}.key",
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/" + @fqdn + ".key") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crt':
-               source  => 'puppet:///modules/exim/certs/ca.crt',
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crt") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crl':
-               source  => 'puppet:///modules/exim/certs/ca.crl',
+               content => inline_template('<%= File.read(scope().call_function("hiera", ["paths.auto_certs_dir"]) + "/ca.crl") %>'),
                group   => 'Debian-exim',
                mode    => '0640',
        }
@@ -135,28 +131,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.