From: Stephen Gran <steve@lobefin.net>
Date: Tue, 23 Apr 2013 06:34:39 +0000 (+0100)
Subject: make directory implicit
X-Git-Url: https://git.donarmstrong.com/?p=dsa-puppet.git;a=commitdiff_plain;h=cdc5eddb2cb3f9905e90c3093a61e0bf5ecc1195

make directory implicit

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp
index 0b129198..de214425 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
diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index 41352cf7..5ef8f960 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -2,7 +2,6 @@ class roles::mailrelay {
 	exim::vdomain { 'admin.debian.org':
 		user       => mail_admin,
 		group      => mail_admin,
-		maildir    => '/srv/admin.debian.org/',
 		alias_file => 'puppet:///modules/exim/admin.debian.org/aliases'
 	}
 }