projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add sso.debian.org
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
727a097
..
4628753
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-38,13
+38,6
@@
class exim {
ensure => absent,
force => true,
}
ensure => absent,
force => true,
}
- # git checkouts through puppet. yummy.
- file { '/etc/exim4/email-virtualdomains':
- recurse => true,
- source => 'puppet:///modules/exim/email-virtualdomains',
- purge => true,
- ignore => '.git',
- }
file { '/etc/exim4/conf.d':
ensure => directory,
purge => true,
file { '/etc/exim4/conf.d':
ensure => directory,
purge => true,
@@
-150,11
+143,11
@@
class exim {
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
@@
-166,4
+159,17
@@
class exim {
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
+ }
}
}