X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fexim%2Fmanifests%2Fvdomain.pp;h=8ab9850a9afc4fbf64de08e43356a63c889cc6d7;hb=a34dec7c518944b4f781e59eca7a0489e98dcae4;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..8ab9850a9 100644
--- a/modules/exim/manifests/vdomain.pp
+++ b/modules/exim/manifests/vdomain.pp
@@ -1,28 +1,33 @@
 define exim::vdomain (
-	$alias_file,
-	$user,
-	$group,
-	$maildir,
-	$domain=$name,
+  $alias_file,
+  $user,
+  $group,
+  $maildir="/srv/${name}",
+  $domain=$name,
 ) {
-	include exim::vdomain::setup
+  file { $maildir:
+    ensure => directory,
+    mode   => '0755',
+    owner  => root,
+    group  => root
+  }
 
-	file { $maildir:
-		ensure => directory,
-		mode   => '0755',
-		owner  => root,
-		group  => root
-	}
+  file { "${maildir}/mail":
+    ensure => directory,
+    mode   => '0755',
+    owner  => root,
+    group  => root
+  }
 
-	file { "${maildir}/aliases":
-		source => $alias_file,
-		mode   => '0644',
-		owner  => root,
-		group  => root
-	}
+  file { "${maildir}/mail/aliases":
+    source => $alias_file,
+    mode   => '0644',
+    owner  => root,
+    group  => root
+  }
 
-	concat::fragment { "virtualdomain_${domain}":
-		target  => '/etc/exim4/virtualdomains',
-		content => "${domain}: user=${user} group=${group} directory=${maildir}\n",
-	}
+  concat::fragment { "virtualdomain_${domain}":
+    target  => '/etc/exim4/virtualdomains',
+    content => "${domain}: user=${user} group=${group} directory=${maildir}/mail\n",
+  }
 }