diff options
Diffstat (limited to 'manifests/classes/postfix.pp')
| -rw-r--r-- | manifests/classes/postfix.pp | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp index 4449629..5084fa6 100644 --- a/manifests/classes/postfix.pp +++ b/manifests/classes/postfix.pp @@ -40,14 +40,25 @@ class postfix { case $root_mail_recipient { "": { $root_mail_recipient = "nobody" } } - case $postfix_use_amavisd { - "": { $postfix_use_amavisd = "no" } - "yes": { include postfix::amavis } + "": { $postfix_use_amavisd = "no" } + } + case $postfix_use_dovecot_lda { + "": { $postfix_use_dovecot_lda = "no" } + } + case $postfix_use_schleuder { + "": { $postfix_use_schleuder = "no" } + } + case $postfix_use_sympa { + "": { $postfix_use_sympa = "no" } + } + case $postfix_mastercf_tail { + "": { $postfix_mastercf_tail = "" } } - - + if $postfix_use_amavisd == 'yes' { + include postfix::amavis + } package { ["postfix", "mailx"]: ensure => installed @@ -90,7 +101,7 @@ class postfix { content => $operatingsystem ? { Redhat => template("postfix/master.cf.redhat5.erb"), CentOS => template("postfix/master.cf.redhat5.erb"), - Debian => template("postfix/master.cf.debian-etch.erb"), + Debian => template("postfix/master.cf.debian-$lsbdistcodename.erb"), Ubuntu => template("postfix/master.cf.debian-etch.erb"), }, seltype => $postfix_seltype, |