aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrancois Deppierraz <francois.deppierraz@camptocamp.com>2009-12-22 20:28:15 +0100
committerFrancois Deppierraz <francois.deppierraz@camptocamp.com>2009-12-22 20:30:26 +0100
commit18661db4da9bb3f599ee473993c267de918fa0ce (patch)
tree8910cd4f931b54ab8609279541108ad098ea5b60
parent8a23f6d5b1022d79432734366e131af6f5d3b46f (diff)
downloadpuppet-postfix-18661db4da9bb3f599ee473993c267de918fa0ce.tar.gz
puppet-postfix-18661db4da9bb3f599ee473993c267de918fa0ce.tar.bz2
Breaks backward compat: A few $postfix_ng_ variables were changed into $postfix_ variables
-rw-r--r--manifests/classes/postfix-mailman.pp2
-rw-r--r--manifests/classes/postfix-mta.pp4
-rw-r--r--manifests/classes/postfix.pp4
-rw-r--r--templates/master.cf.debian-etch.erb2
-rw-r--r--templates/master.cf.redhat5.erb2
5 files changed, 7 insertions, 7 deletions
diff --git a/manifests/classes/postfix-mailman.pp b/manifests/classes/postfix-mailman.pp
index c6c7981..cba0848 100644
--- 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 9046bad..16b1981 100644
--- 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 8c4173e..91a33e3 100644
--- 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 674682c..9a8351a 100644
--- 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 08564b2..8c3ee53 100644
--- 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