From: intrigeri <intrigeri@boum.org>
Date: Wed, 10 Nov 2010 17:32:12 +0000 (+0100)
Subject: Merge remote branch 'nadir/master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=07c02213dbd453523a07857a6dc15a25fc4b5bde;p=puppet-postfix.git

Merge remote branch 'nadir/master'

Conflicts:
	manifests/classes/postfix.pp
---

07c02213dbd453523a07857a6dc15a25fc4b5bde
diff --cc manifests/classes/postfix-amavis.pp
index 0000000,c325238..d42237d
mode 000000,100644..100644
--- a/manifests/classes/postfix-amavis.pp
+++ b/manifests/classes/postfix-amavis.pp
@@@ -1,0 -1,8 +1,8 @@@
 -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 --cc manifests/classes/postfix.pp
index 627fcf1,4449629..5084fa6
--- a/manifests/classes/postfix.pp
+++ b/manifests/classes/postfix.pp
@@@ -40,22 -40,15 +40,26 @@@ 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
    }