aboutsummaryrefslogtreecommitdiff
path: root/manifests
diff options
context:
space:
mode:
authorVarac <varacanero@zeromail.org>2009-12-17 16:37:53 +0100
committerVarac <varacanero@zeromail.org>2009-12-17 16:37:53 +0100
commit60544a57c9e2d014061d2c2775654918890a648c (patch)
tree77e9a65cffe8161d77d70ae629afe9a20868058f /manifests
parent8a23f6d5b1022d79432734366e131af6f5d3b46f (diff)
downloadpuppet-postfix-60544a57c9e2d014061d2c2775654918890a648c.tar.gz
puppet-postfix-60544a57c9e2d014061d2c2775654918890a648c.tar.bz2
added postfix::amavis, no relayhost needed for postfix::mta
Diffstat (limited to 'manifests')
-rw-r--r--manifests/classes/postfix-amavis.pp7
-rw-r--r--manifests/classes/postfix-mta.pp6
-rw-r--r--manifests/classes/postfix.pp9
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"],