From a1c524580b46f0b89e971e582c4f62b6620a01c0 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Sun, 22 Sep 2019 09:57:55 +0200 Subject: [PATCH] vdomain: do not create and/or mess with the modes of basedir --- modules/exim/manifests/vdomain.pp | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/modules/exim/manifests/vdomain.pp b/modules/exim/manifests/vdomain.pp index ef339dd6d..ef3c0183b 100644 --- a/modules/exim/manifests/vdomain.pp +++ b/modules/exim/manifests/vdomain.pp @@ -4,25 +4,16 @@ # @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: ensure => directory, mode => '2755', -- 2.20.1