summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-08-06 18:31:28 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-08-06 18:31:28 -0300
commitc275f5e9b1b9197c3d546661d866450a2746534b (patch)
tree5a69dab548f01c0fd2617965a427bacad04c873b
parent713c0e5b7eb306e7f0112b93dec90c13c3df9df5 (diff)
downloadpuppet-mail-c275f5e9b1b9197c3d546661d866450a2746534b.tar.gz
puppet-mail-c275f5e9b1b9197c3d546661d866450a2746534b.tar.bz2
Using postfix_use_amavisd
-rw-r--r--manifests/amavisd.pp2
-rw-r--r--manifests/mail.pp1
2 files changed, 1 insertions, 2 deletions
diff --git a/manifests/amavisd.pp b/manifests/amavisd.pp
index 1047fb0..d59670a 100644
--- a/manifests/amavisd.pp
+++ b/manifests/amavisd.pp
@@ -1,6 +1,4 @@
class mail::amavisd {
- # TODO: master.cf
-
service { "amavisd":
ensure => running,
require => Package['amavisd-new'],
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 7d70823..06987d9 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -1,6 +1,7 @@
class mail {
$mail_delivery = "postfix"
$postfix_smtp_listen = "all"
+ $postfix_use_amavisd = "yes"
$postfix_mydestination = '$myhostname, $mydomain, localhost.$mydomain, localhost'
case $postfix_mynetworks {