X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fexim%2Fmanifests%2Fvdomain.pp;h=ef3c0183bc172172600c2e35f7ff288785e9a66b;hb=ec1fa09c54aa7b7ec894577929e96ebe97a94508;hp=4ce67800ad9ac73cdc017c95d44765ade6e1efc7;hpb=fcfcf859ac7a3fd03ba5240212e8b487d3932a11;p=mirror%2Fdsa-puppet.git

diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp
index 4ce67800a..ef3c0183b 100644
--- a/modules/exim/manifests/vdomain.pp
+++ b/modules/exim/manifests/vdomain.pp
@@ -4,26 +4,17 @@
 # @param mail_group Group to run the virtual email domain's pipe jobs and deliveries as
 # @param owner      User to own the directories and files
 # @param group      Group to own the directories and files
-# @param domain   email domain (defaults to $name)
-# @param basedir  Base directory (it gets created), usually is and defaults to /srv/$name
-# @param maildir  Mail directory, usually under base and defaults to $basedir/mail
+# @param domain     email domain (defaults to $name)
+# @param maildir    Mail directory, usually and defaults to /srv/$name/mail
 define exim::vdomain (
   String $domain = $name,
-  String $basedir = "/srv/${name}",
-  String $maildir = "${basedir}/mail",
+  String $maildir = "/srv/${name}/mail",
   String $owner = 'root',
   String $group = 'root',
   String $mail_user = $owner,
   String $mail_group = $group,
 ) {
-  file { $basedir:
-    ensure => directory,
-    mode   => '2755',
-    owner  => $owner,
-    group  => $group,
-  }
-
-  file { "${maildir}":
+  file { $maildir:
     ensure => directory,
     mode   => '2755',
     owner  => $owner,