There is no bugsmaster role anymore. Remove remaining users

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

diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp
index a9529ca..8b47024 100644 (file)
--- a/modules/exim/manifests/init.pp
+++ b/modules/exim/manifests/init.pp
@@ -1,5 +1,14 @@
 class exim {
 
+       $is_mailrelay = has_role('mailrelay')
+       $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': }
        munin::check { 'exim_mailstats': }
@@ -12,6 +21,12 @@ class exim {
 
        Package['exim4-daemon-heavy']->Mailalias<| |>
 
+       concat::fragment { 'virtual_domain_template':
+               target  => '/etc/exim4/virtualdomains',
+               content => template('exim/virtualdomains.erb'),
+               order   => '05',
+       }
+
        service { 'exim4':
                ensure  => running,
                require => [
@@ -27,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,
@@ -42,7 +54,7 @@ class exim {
        }
        file { '/etc/exim4/ssl':
                ensure  => directory,
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0750',
                purge   => true,
        }
@@ -60,9 +72,6 @@ class exim {
        file { '/etc/exim4/locals':
                content => template('exim/locals.erb')
        }
-       file { '/etc/exim4/virtualdomains':
-               content => template('exim/virtualdomains.erb'),
-       }
        file { '/etc/exim4/submission-domains':
                content => template('exim/submission-domains.erb'),
        }
@@ -101,47 +110,31 @@ class exim {
        }
        file { '/etc/exim4/ssl/thishost.crt':
                source  => "puppet:///modules/exim/certs/${::fqdn}.crt",
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/thishost.key':
                source  => "puppet:///modules/exim/certs/${::fqdn}.key",
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crt':
                source  => 'puppet:///modules/exim/certs/ca.crt',
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/etc/exim4/ssl/ca.crl':
                source  => 'puppet:///modules/exim/certs/ca.crl',
-               group   => Debian-exim,
+               group   => 'Debian-exim',
                mode    => '0640',
        }
        file { '/var/log/exim4':
                ensure  => directory,
                mode    => '2750',
-               owner   => Debian-exim,
+               owner   => 'Debian-exim',
                group   => maillog,
        }
 
-       case getfromhash($site::nodeinfo, 'mail_port') {
-               /^(\d+)$/: { $mail_port = $1 }
-               default: { $mail_port = 'smtp' }
-       }
-
-       @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)"
-       }
-
        # 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.
@@ -151,4 +144,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
+       }
 }