projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mirror-anu must not be in apache2_www_mirror if it is in static
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
mx.pp
diff --git
a/modules/exim/manifests/mx.pp
b/modules/exim/manifests/mx.pp
index
3c40623
..
54f1933
100644
(file)
--- a/
modules/exim/manifests/mx.pp
+++ b/
modules/exim/manifests/mx.pp
@@
-23,13
+23,23
@@
class exim::mx inherits exim {
domain => 'ip6',
rule => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
}
domain => 'ip6',
rule => '&SERVICE_RANGE(tcp, submission, $SMTP_V6_SOURCES)',
}
- dnsextras::
entry
{ "tlsa-submission":
+ dnsextras::
tlsa_record
{ "tlsa-submission":
zone => 'debian.org',
zone => 'debian.org',
-
label => "_587._tcp.${::fqdn}
",
-
rrtype => 'TXT'
,
- rrdata => 'testing' }
-
+
certfile => "/etc/puppet/modules/exim/files/certs/${::fqdn}.crt
",
+
port => 587
,
+ hostname => "$::fqdn",
+ }
package { 'nagios-plugins-standard':
ensure => installed,
}
package { 'nagios-plugins-standard':
ensure => installed,
}
+
+ if has_role('mailrelay') {
+ file { '/etc/cron.d/dsa-email-virtualdomains':
+ source => 'puppet:///modules/exim/dsa-email-virtualdomains.cron',
+ }
+ } else {
+ file { '/etc/cron.d/dsa-email-virtualdomains':
+ ensure => absent,
+ }
+ }
}
}