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 8bab13308be074ca5ff00fba735d1d25c7a9803e..6ac8cdf767b0ac15dc5335043621d146d8098b38 100644 (file)
--- 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 c6abab28a76e349a84f6d425d0194963848b166f..41352cf7c68f0d775f5204d4057a258f4d65d135 100644 (file)
--- 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'
        }
 }