From: Stephen Gran <steve@lobefin.net>
Date: Mon, 22 Apr 2013 20:22:20 +0000 (+0100)
Subject: get better at mkdir
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=4ace76bfb0e17d0b4618667063ac2f6fed6652a4;p=mirror%2Fdsa-puppet.git

get better at mkdir

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

diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp
index 8bab13308..6ac8cdf76 100644
--- a/modules/exim/manifests/vdomain.pp
+++ b/modules/exim/manifests/vdomain.pp
@@ -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,
diff --git a/modules/roles/manifests/mailrelay.pp b/modules/roles/manifests/mailrelay.pp
index c6abab28a..41352cf7c 100644
--- a/modules/roles/manifests/mailrelay.pp
+++ b/modules/roles/manifests/mailrelay.pp
@@ -2,7 +2,7 @@ class roles::mailrelay {
 	exim::vdomain { 'admin.debian.org':
 		user       => mail_admin,
 		group      => mail_admin,
-		maildir    => '/org/admin.debian.org/mail/',
+		maildir    => '/srv/admin.debian.org/',
 		alias_file => 'puppet:///modules/exim/admin.debian.org/aliases'
 	}
 }