X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fvdomain.pp;h=de2144254ff15b40baff69f698f09f11ce8dfff9;hb=20837932686b93b71481bb8ee38c902d06b25fa2;hp=8bab13308be074ca5ff00fba735d1d25c7a9803e;hpb=6e1b9a5cc95470779d6b23cb79de8caca2d1c548;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp
index 8bab13308..de2144254 100644
--- a/modules/exim/manifests/vdomain.pp
+++ b/modules/exim/manifests/vdomain.pp
@@ -2,7 +2,7 @@ define exim::vdomain (
 	$alias_file,
 	$user,
 	$group,
-	$maildir,
+	$maildir="/srv/${name}",
 	$domain=$name,
 ) {
 	include exim::vdomain::setup
@@ -14,7 +14,14 @@ define exim::vdomain (
 		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,
@@ -23,6 +30,6 @@ define exim::vdomain (
 
 	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",
 	}
 }