aboutsummaryrefslogtreecommitdiff
path: root/manifests/classes/postfix.pp
diff options
context:
space:
mode:
authorintrigeri <intrigeri@boum.org>2010-11-10 18:32:12 +0100
committerintrigeri <intrigeri@boum.org>2010-11-10 18:32:12 +0100
commit07c02213dbd453523a07857a6dc15a25fc4b5bde (patch)
tree7dfd11fc181f93399037a15a7900dda30fd1d7ef /manifests/classes/postfix.pp
parentb8fc529f06ce01b38142ab920388a921701c3c73 (diff)
parent96b41a3e47819846cc8bb0b626f4f8b705b77890 (diff)
downloadpuppet-postfix-07c02213dbd453523a07857a6dc15a25fc4b5bde.tar.gz
puppet-postfix-07c02213dbd453523a07857a6dc15a25fc4b5bde.tar.bz2
Merge remote branch 'nadir/master'
Conflicts: manifests/classes/postfix.pp
Diffstat (limited to 'manifests/classes/postfix.pp')
-rw-r--r--manifests/classes/postfix.pp4
1 files changed, 4 insertions, 0 deletions
diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp
index 627fcf1..5084fa6 100644
--- a/manifests/classes/postfix.pp
+++ b/manifests/classes/postfix.pp
@@ -56,6 +56,10 @@ class postfix {
"": { $postfix_mastercf_tail = "" }
}
+ if $postfix_use_amavisd == 'yes' {
+ include postfix::amavis
+ }
+
package { ["postfix", "mailx"]:
ensure => installed
}