aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2010-11-02 20:34:01 +0100
committervarac <varacanero@zeromail.org>2010-11-02 20:34:01 +0100
commit000ec536a0260aaccb65968f16dcedd0728b4e0f (patch)
treeb12d315760bd3fd1059bdc3a634655031e643b07
parente775f510cd06fb2d38367e975bbd819cd6212cd6 (diff)
downloadpuppet-postfix-000ec536a0260aaccb65968f16dcedd0728b4e0f.tar.gz
puppet-postfix-000ec536a0260aaccb65968f16dcedd0728b4e0f.tar.bz2
-> as in template
-rw-r--r--README2
-rw-r--r--manifests/classes/postfix.pp10
2 files changed, 6 insertions, 6 deletions
diff --git a/README b/README
index c2b58e9..c81554e 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@ A couple of classes will preconfigure postfix for common needs.
Config
------
-- set $postfix_amavis="true" to include postfix::amavis
+- set $postfix_use_amavisd="true" to include postfix::amavis
== Example:
diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp
index 36089a6..4449629 100644
--- a/manifests/classes/postfix.pp
+++ b/manifests/classes/postfix.pp
@@ -5,13 +5,13 @@
# delivery and an SMTP server listening on the loopback interface.
#
# Parameters:
-# - *$postfix_ng_smtp_listen*: address on which the smtp service will listen to. defaults to 127.0.0.1
+# - *$postfix_smtp_listen*: address on which the smtp service will listen to. defaults to 127.0.0.1
# - *$root_mail_recipient*: who will recieve root's emails. defaults to "nobody"
#
# Example usage:
#
# node "toto.example.com" {
-# $postfix_ng_smtp_listen = "192.168.1.10"
+# $postfix_smtp_listen = "192.168.1.10"
# include postfix
# }
#
@@ -41,9 +41,9 @@ class postfix {
"": { $root_mail_recipient = "nobody" }
}
- case $postfix_amavis {
- "": { $postfix_amavis = "false" }
- "true": { include postfix::amavis }
+ case $postfix_use_amavisd {
+ "": { $postfix_use_amavisd = "no" }
+ "yes": { include postfix::amavis }
}