Merge remote branch 'nadir/master'

Conflicts:
	manifests/classes/postfix.pp

diff --cc manifests/classes/postfix-amavis.pp
index 0000000000000000000000000000000000000000,c32523871f3b44b46d2ec2eb7ea8abd2e17fe0e8..d42237da25b3897e468b1d5dff1305d905d1e3ac
mode 000000,100644..100644
--- /dev/null
--- 2/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 627fcf11918a4abb3f31f86fb93d818880d6f937,4449629b482b99c11afd49fb5d182ee92fd5e103..5084fa6f5b7a7dd1850bcac93ab83458622ea287
--- 1/manifests/classes/postfix.pp
--- 2/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
    }