projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "try to get node names this way"
[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
..
4628753
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-1,5
+1,7
@@
class exim {
class exim {
+ include exim::vdomain::setup
+
munin::check { 'ps_exim4': script => 'ps_' }
munin::check { 'exim_mailqueue': }
munin::check { 'exim_mailstats': }
munin::check { 'ps_exim4': script => 'ps_' }
munin::check { 'exim_mailqueue': }
munin::check { 'exim_mailstats': }
@@
-12,6
+14,12
@@
class exim {
Package['exim4-daemon-heavy']->Mailalias<| |>
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 => [
service { 'exim4':
ensure => running,
require => [
@@
-27,11
+35,8
@@
class exim {
purge => true,
}
file { '/etc/exim4/Git':
purge => true,
}
file { '/etc/exim4/Git':
- ensure => directory,
- purge => true,
+ ensure => absent,
force => true,
force => true,
- recurse => true,
- source => 'puppet:///files/empty/',
}
file { '/etc/exim4/conf.d':
ensure => directory,
}
file { '/etc/exim4/conf.d':
ensure => directory,
@@
-60,9
+65,6
@@
class exim {
file { '/etc/exim4/locals':
content => template('exim/locals.erb')
}
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'),
}
file { '/etc/exim4/submission-domains':
content => template('exim/submission-domains.erb'),
}
@@
-128,7
+130,7
@@
class exim {
case getfromhash($site::nodeinfo, 'mail_port') {
/^(\d+)$/: { $mail_port = $1 }
case getfromhash($site::nodeinfo, 'mail_port') {
/^(\d+)$/: { $mail_port = $1 }
- default: { $mail_port = '
smtp
' }
+ default: { $mail_port = '
25
' }
}
@ferm::rule { 'dsa-exim':
}
@ferm::rule { 'dsa-exim':
@@
-141,6
+143,12
@@
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',
+ 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,
# 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,
@@
-151,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
+ }
}
}