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
/
vdomain.pp
diff --git
a/modules/exim/manifests/vdomain.pp
b/modules/exim/manifests/vdomain.pp
index
8bab133
..
de21442
100644
(file)
--- a/
modules/exim/manifests/vdomain.pp
+++ b/
modules/exim/manifests/vdomain.pp
@@
-2,7
+2,7
@@
define exim::vdomain (
$alias_file,
$user,
$group,
$alias_file,
$user,
$group,
- $maildir,
+ $maildir
="/srv/${name}"
,
$domain=$name,
) {
include exim::vdomain::setup
$domain=$name,
) {
include exim::vdomain::setup
@@
-14,7
+14,14
@@
define exim::vdomain (
group => root
}
group => root
}
- file { "${maildir}/aliases":
+ file { "${maildir}/mail":
+ ensure => directory,
+ mode => '0755',
+ owner => root,
+ group => root
+ }
+
+ file { "${maildir}/mail/aliases":
source => $alias_file,
mode => '0644',
owner => root,
source => $alias_file,
mode => '0644',
owner => root,
@@
-23,6
+30,6
@@
define exim::vdomain (
concat::fragment { "virtualdomain_${domain}":
target => '/etc/exim4/virtualdomains',
concat::fragment { "virtualdomain_${domain}":
target => '/etc/exim4/virtualdomains',
- content => "${domain}: user=${user} group=${group} directory=${maildir}\n",
+ content => "${domain}: user=${user} group=${group} directory=${maildir}
/mail
\n",
}
}
}
}