projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Only mail on error
[mirror/dsa-puppet.git]
/
modules
/
exim
/
manifests
/
init.pp
diff --git
a/modules/exim/manifests/init.pp
b/modules/exim/manifests/init.pp
index
e18f0aa
..
abe0237
100644
(file)
--- a/
modules/exim/manifests/init.pp
+++ b/
modules/exim/manifests/init.pp
@@
-12,7
+12,10
@@
class exim {
service { 'exim4':
ensure => running,
service { 'exim4':
ensure => running,
- require => File['/etc/exim4/exim4.conf'],
+ require => [
+ File['/etc/exim4/exim4.conf'],
+ Package['exim4-daemon-heavy'],
+ ]
}
file { '/etc/exim4/':
}
file { '/etc/exim4/':
@@
-43,6
+46,7
@@
class exim {
}
file { '/etc/exim4/exim4.conf':
content => template('exim/eximconf.erb'),
}
file { '/etc/exim4/exim4.conf':
content => template('exim/eximconf.erb'),
+ require => File['/etc/exim4/ssl/thishost.crt'],
notify => Service['exim4'],
}
file { '/etc/mailname':
notify => Service['exim4'],
}
file { '/etc/mailname':
@@
-58,7
+62,7
@@
class exim {
content => template('exim/virtualdomains.erb'),
}
file { '/etc/exim4/submission-domains':
content => template('exim/virtualdomains.erb'),
}
file { '/etc/exim4/submission-domains':
- content => template('exim/
common/
submission-domains.erb'),
+ content => template('exim/submission-domains.erb'),
}
file { '/etc/exim4/host_blacklist':
source => 'puppet:///modules/exim/common/host_blacklist',
}
file { '/etc/exim4/host_blacklist':
source => 'puppet:///modules/exim/common/host_blacklist',
@@
-127,18
+131,18
@@
class exim {
@ferm::rule { 'dsa-exim':
description => 'Allow SMTP',
@ferm::rule { 'dsa-exim':
description => 'Allow SMTP',
- rule =>
'&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)'
+ rule =>
"&SERVICE_RANGE(tcp, $mail_port, \$SMTP_SOURCES)"
}
@ferm::rule { 'dsa-exim-v6':
description => 'Allow SMTP',
domain => 'ip6',
}
@ferm::rule { 'dsa-exim-v6':
description => 'Allow SMTP',
domain => 'ip6',
- rule =>
'&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)'
+ rule =>
"&SERVICE_RANGE(tcp, $mail_port, \$SMTP_V6_SOURCES)"
}
# 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
- # and makes the logs quiet. There are better ways of making logs quiet,
- # though.
+
# and makes the logs quiet. There are better ways of making logs quiet,
+
# though.
@ferm::rule { 'dsa-ident':
domain => '(ip ip6)',
description => 'Allow ident access',
@ferm::rule { 'dsa-ident':
domain => '(ip ip6)',
description => 'Allow ident access',