From 5a78a9fd974e875f5f25653812077ee73e55614e Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 29 Jun 2013 16:07:43 +0100 Subject: [PATCH] We want to drop some aliases on exim systems These do not affect the aliases in use on mail domains, just on the bare machine name - so we are removing hostmast@franck.debian.org, not hostmaster@ftp-master.debian.org, and so on. Signed-off-by: Stephen Gran --- modules/exim/manifests/init.pp | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/modules/exim/manifests/init.pp b/modules/exim/manifests/init.pp index 727a097b..9f362243 100644 --- a/modules/exim/manifests/init.pp +++ b/modules/exim/manifests/init.pp @@ -38,7 +38,7 @@ class exim { ensure => absent, force => true, } - # git checkouts through puppet. yummy. + # git checkouts through puppet. yummy. file { '/etc/exim4/email-virtualdomains': recurse => true, source => 'puppet:///modules/exim/email-virtualdomains', @@ -150,11 +150,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 +166,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 + } } -- 2.39.2