Breaks backward compat: A few $postfix_ng_ variables were changed into $postfix_...

diff --git a/manifests/classes/postfix-mailman.pp b/manifests/classes/postfix-mailman.pp
index c6c79816b597c2076ed3a30e6a12c422d848396c..cba0848600fe1cd00dd13e8fe9fbd6ed852a83cc 100644 (file)
--- a/manifests/classes/postfix-mailman.pp
+++ b/manifests/classes/postfix-mailman.pp
@@ -15,7 +15,7 @@
 #   }
 #
 class postfix::mailman {
-  $postfix_ng_smtp_listen = "0.0.0.0"
+  $postfix_smtp_listen = "0.0.0.0"
   include postfix
 
   postfix::config {

diff --git a/manifests/classes/postfix-mta.pp b/manifests/classes/postfix-mta.pp
index 9046bad4c91843abcf1408153d40848f05b2da7d..16b1981265a21ecad2d88c14ca18cde1c7b59972 100644 (file)
--- a/manifests/classes/postfix-mta.pp
+++ b/manifests/classes/postfix-mta.pp
@@ -2,7 +2,7 @@
 # == Class: postfix::mta
 #
 # This class configures a minimal MTA, listening on
-# $postfix_ng_smtp_listen (default to localhost) and delivering mail to
+# $postfix_smtp_listen (default to localhost) and delivering mail to
 # $postfix_mydestination (default to $fqdn).
 #
 # A valid relay host is required ($postfix_relayhost) for outbound email.
@@ -19,7 +19,7 @@
 #
 #   node "toto.example.com" {
 #     $postfix_relayhost = "mail.example.com"
-#     $postfix_ng_smtp_listen = "0.0.0.0"
+#     $postfix_smtp_listen = "0.0.0.0"
 #     $postfix_mydestination = "\$myorigin, myapp.example.com"
 #
 #     include postfix::mta

diff --git a/manifests/classes/postfix.pp b/manifests/classes/postfix.pp
index 8c4173ebeabd78b3413f43dc59888a839468394e..91a33e3fc7897dfacba8f1c104468e3dfaa3e43a 100644 (file)
--- a/manifests/classes/postfix.pp
+++ b/manifests/classes/postfix.pp
@@ -34,8 +34,8 @@ class postfix {
   }
 
   # Default value for various options
-  case $postfix_ng_smtp_listen {
-    "": { $postfix_ng_smtp_listen = "127.0.0.1" }
+  case $postfix_smtp_listen {
+    "": { $postfix_smtp_listen = "127.0.0.1" }
   }
   case $root_mail_recipient {
     "":   { $root_mail_recipient = "nobody" }

diff --git a/templates/master.cf.debian-etch.erb b/templates/master.cf.debian-etch.erb
index 674682c2e818b82db8d41794c504f68a0a79d958..9a8351ab0f34ce3d497246d5796f19e09d564e7f 100644 (file)
--- a/templates/master.cf.debian-etch.erb
+++ b/templates/master.cf.debian-etch.erb
@@ -7,7 +7,7 @@
 # service type  private unpriv  chroot  wakeup  maxproc command + args
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
-<%= postfix_ng_smtp_listen %>:smtp      inet  n       -       -       -       -       smtpd
+<%= postfix_smtp_listen %>:smtp      inet  n       -       -       -       -       smtpd
 #submission inet n       -       -       -       -       smtpd
 #  -o smtpd_enforce_tls=yes
 #  -o smtpd_sasl_auth_enable=yes

diff --git a/templates/master.cf.redhat5.erb b/templates/master.cf.redhat5.erb
index 08564b2e29c2011c8d3f54164c77cd201ba988d3..8c3ee53d81507a454df29e85a9785f42ceca6e4b 100644 (file)
--- a/templates/master.cf.redhat5.erb
+++ b/templates/master.cf.redhat5.erb
@@ -7,7 +7,7 @@
 # service type  private unpriv  chroot  wakeup  maxproc command + args
 #               (yes)   (yes)   (yes)   (never) (100)
 # ==========================================================================
-<%= postfix_ng_smtp_listen %>:smtp      inet  n       -       n       -       -       smtpd
+<%= postfix_smtp_listen %>:smtp      inet  n       -       n       -       -       smtpd
 #smtp      inet  n       -       n       -       -       smtpd
 #submission inet n       -       n       -       -       smtpd
 #  -o smtpd_enforce_tls=yes