summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
034f2fc)
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 <steve@lobefin.net>
ensure => absent,
force => true,
}
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',
file { '/etc/exim4/email-virtualdomains':
recurse => true,
source => 'puppet:///modules/exim/email-virtualdomains',
domain => 'ip6',
rule => "&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
}
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",
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
}
# Do we actually want this? I'm only doing it because it's harmless
rule => '&SERVICE(tcp, 113)'
}
rule => '&SERVICE(tcp, 113)'
}
+ # These only affect the alias @$fqdn, not say, @debian.org
+
+ mailalias { [
+ 'postmaster',
+ 'hostmaster',
+ 'usenet',
+ 'webmaster',
+ 'abuse',
+ 'noc',
+ 'security',
+ ]:
+ ensure => absent
+ }