Breaks backward compat: A few $postfix_ng_ variables were changed into $postfix_ variables
This commit is contained in:
parent
8a23f6d5b1
commit
18661db4da
5 changed files with 7 additions and 7 deletions
|
@ -15,7 +15,7 @@
|
||||||
# }
|
# }
|
||||||
#
|
#
|
||||||
class postfix::mailman {
|
class postfix::mailman {
|
||||||
$postfix_ng_smtp_listen = "0.0.0.0"
|
$postfix_smtp_listen = "0.0.0.0"
|
||||||
include postfix
|
include postfix
|
||||||
|
|
||||||
postfix::config {
|
postfix::config {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# == Class: postfix::mta
|
# == Class: postfix::mta
|
||||||
#
|
#
|
||||||
# This class configures a minimal MTA, listening on
|
# 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).
|
# $postfix_mydestination (default to $fqdn).
|
||||||
#
|
#
|
||||||
# A valid relay host is required ($postfix_relayhost) for outbound email.
|
# A valid relay host is required ($postfix_relayhost) for outbound email.
|
||||||
|
@ -19,7 +19,7 @@
|
||||||
#
|
#
|
||||||
# node "toto.example.com" {
|
# node "toto.example.com" {
|
||||||
# $postfix_relayhost = "mail.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"
|
# $postfix_mydestination = "\$myorigin, myapp.example.com"
|
||||||
#
|
#
|
||||||
# include postfix::mta
|
# include postfix::mta
|
||||||
|
|
|
@ -34,8 +34,8 @@ class postfix {
|
||||||
}
|
}
|
||||||
|
|
||||||
# Default value for various options
|
# Default value for various options
|
||||||
case $postfix_ng_smtp_listen {
|
case $postfix_smtp_listen {
|
||||||
"": { $postfix_ng_smtp_listen = "127.0.0.1" }
|
"": { $postfix_smtp_listen = "127.0.0.1" }
|
||||||
}
|
}
|
||||||
case $root_mail_recipient {
|
case $root_mail_recipient {
|
||||||
"": { $root_mail_recipient = "nobody" }
|
"": { $root_mail_recipient = "nobody" }
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# service type private unpriv chroot wakeup maxproc command + args
|
# service type private unpriv chroot wakeup maxproc command + args
|
||||||
# (yes) (yes) (yes) (never) (100)
|
# (yes) (yes) (yes) (never) (100)
|
||||||
# ==========================================================================
|
# ==========================================================================
|
||||||
<%= postfix_ng_smtp_listen %>:smtp inet n - - - - smtpd
|
<%= postfix_smtp_listen %>:smtp inet n - - - - smtpd
|
||||||
#submission inet n - - - - smtpd
|
#submission inet n - - - - smtpd
|
||||||
# -o smtpd_enforce_tls=yes
|
# -o smtpd_enforce_tls=yes
|
||||||
# -o smtpd_sasl_auth_enable=yes
|
# -o smtpd_sasl_auth_enable=yes
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
# service type private unpriv chroot wakeup maxproc command + args
|
# service type private unpriv chroot wakeup maxproc command + args
|
||||||
# (yes) (yes) (yes) (never) (100)
|
# (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
|
#smtp inet n - n - - smtpd
|
||||||
#submission inet n - n - - smtpd
|
#submission inet n - n - - smtpd
|
||||||
# -o smtpd_enforce_tls=yes
|
# -o smtpd_enforce_tls=yes
|
||||||
|
|
Loading…
Reference in a new issue