-> as in template

diff --git a/README b/README
index c2b58e958c61230c1a906cda2d01522d4b4b8c3c..c81554e2cdf5373ec948f6a88df623dc84708513 100644 (file)
--- 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 36089a6e1bdaa912cc4e69fc9011db838bf831db..4449629b482b99c11afd49fb5d182ee92fd5e103 100644 (file)
--- 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 }
   }