projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the www.d.o apache config a template
[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
..
096100d
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 => [
@@
-60,9
+68,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'),
}