Merge remote branch 'nadir/master'

Conflicts:
	manifests/classes/postfix.pp

4 files changed, 19 insertions, 3 deletions

diff --git a/README b/README
index 964125f..c81554e 100644
--- a/README
+++ b/README
@@ -4,6 +4,10 @@ This module will help install and configure postfix.
 
 A couple of classes will preconfigure postfix for common needs.
 
+Config
+------
+- set $postfix_use_amavisd="true" to include postfix::amavis
+
 == Example:
 
   include postfix
diff --git a/manifests/classes/postfix-amavis.pp b/manifests/classes/postfix-amavis.pp
new file mode 100644
index 0000000..d42237d
--- /dev/null
+++ b/manifests/classes/postfix-amavis.pp
@@ -0,0 +1,8 @@
+class postfix::amavis {
+	include amavisd-new
+        postfix::config {
+                "content_filter": value => "amavis:[127.0.0.1]:10024";
+        }
+
+}
+
diff --git a/manifests/classes/postfix-mta.pp b/manifests/classes/postfix-mta.pp
index 16b1981..c36c0bc 100644
--- a/manifests/classes/postfix-mta.pp
+++ b/manifests/classes/postfix-mta.pp
@@ -32,9 +32,9 @@
 #
 class postfix::mta {
 
-  case $postfix_relayhost {
-    "":   { fail("Required \$postfix_relayhost variable is not defined.") }
-  }
+  #case $postfix_relayhost {
+  #  "":   { fail("Required \$postfix_relayhost variable is not defined.") }
+  #}
 
   case $postfix_mydestination {
     "": { $postfix_mydestination = "\$myorigin" }
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
   }