added postfix::amavis, no relayhost needed for postfix::mta

3 files changed, 18 insertions, 4 deletions

diff --git a/manifests/classes/postfix-amavis.pp b/manifests/classes/postfix-amavis.pp
new file mode 100644
index 0000000..47ba532
--- /dev/null
+++ b/manifests/classes/postfix-amavis.pp
@@ -0,0 +1,7 @@
+class postfix::amavis {    
+		include amavisd-new
+                postfix::config { 
+                                  "content_filter": value => "smtp-amavis:[localhost]:10024"; }
+
+}
+
diff --git a/manifests/classes/postfix-mta.pp b/manifests/classes/postfix-mta.pp
index 9046bad..ff94c91 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 8c4173e..a413664 100644
--- a/manifests/classes/postfix.pp
+++ b/manifests/classes/postfix.pp
@@ -41,6 +41,13 @@ class postfix {
     "":   { $root_mail_recipient = "nobody" }
   }
 
+  case $postfix_amavis {
+    "":		{ $postfix_amavis = "false" }
+    "true":	{ include postfix::amavis }
+  }
+
+  
+
 
   package { ["postfix", "mailx"]:
     ensure => installed
@@ -81,7 +88,7 @@ class postfix {
     mode => "0644",
     content => $operatingsystem ? {
       Redhat => template("postfix/master.cf.redhat5.erb"),
-      Debian => template("postfix/master.cf.debian-etch.erb"),
+      Debian,Ubuntu => template("postfix/master.cf.debian-etch.erb"),
     },
     seltype => $postfix_seltype,
     notify  => Service["postfix"],