From 4ace76bfb0e17d0b4618667063ac2f6fed6652a4 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 22 Apr 2013 21:22:20 +0100 Subject: [PATCH] get better at mkdir Signed-off-by: Stephen Gran --- modules/exim/manifests/vdomain.pp | 9 ++++++++- modules/roles/manifests/mailrelay.pp | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp index 8bab1330..6ac8cdf7 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 c6abab28..41352cf7 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' } } -- 2.39.2