diff options
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/classes/postfix-amavis.pp | 8 | ||||
| -rw-r--r-- | manifests/classes/postfix.pp | 23 |
2 files changed, 21 insertions, 10 deletions
diff --git a/manifests/classes/postfix-amavis.pp b/manifests/classes/postfix-amavis.pp index c325238..d42237d 100644 --- a/manifests/classes/postfix-amavis.pp +++ b/manifests/classes/postfix-amavis.pp @@ -1,7 +1,7 @@ -class postfix::amavis { - include amavisd-new - postfix::config { - "content_filter": value => "amavis:[127.0.0.1]:10024"; +class postfix::amavis { + include amavisd-new + postfix::config { + "content_filter": value => "amavis:[127.0.0.1]:10024"; } } 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, |