move the remaining virtualdomains to the mailrelay class

[mirror/dsa-puppet.git] / modules / exim / manifests / vdomain.pp

diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp
index 4ce6780..ef3c018 100644 (file)
--- 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,