Changed remaining fqdn references to homename
This commit is contained in:
parent
74d93dae34
commit
ebde843cc6
17 changed files with 48 additions and 52 deletions
|
@ -12,7 +12,7 @@
|
|||
# Optional smarthost used for sending mail.
|
||||
#
|
||||
# $postfix_hostname:
|
||||
# Hostname of postfix server. Defaults to $fqdn.
|
||||
# Hostname of postfix server. Defaults to $homename.
|
||||
#
|
||||
# $postfix_interfaces:
|
||||
# Interfaces to listen. Defaults to 'localhost'.
|
||||
|
@ -55,19 +55,15 @@ class postfix {
|
|||
}
|
||||
|
||||
if !$mail_domain {
|
||||
if $domain {
|
||||
$mail_domain = $domain
|
||||
if $::domain {
|
||||
$mail_domain = $::domain
|
||||
} else {
|
||||
fail("Failed to set \$mail_domain, missing \$domain")
|
||||
}
|
||||
}
|
||||
|
||||
if !$postfix_hostname {
|
||||
if $fqdn {
|
||||
$postfix_hostname = $fqdn
|
||||
} else {
|
||||
fail("Failed to set \$postfix_hostname, missing \$fqdn")
|
||||
}
|
||||
$postfix_hostname = $::homename
|
||||
}
|
||||
|
||||
if !$postfix_interfaces {
|
||||
|
@ -105,7 +101,7 @@ class postfix {
|
|||
require => Package["postfix"],
|
||||
notify => Service["postfix"],
|
||||
}
|
||||
|
||||
|
||||
exec { "usermod-postfix-ssl-cert":
|
||||
path => "/bin:/usr/bin:/sbin:/usr/sbin",
|
||||
command => "usermod -a -G ssl-cert postfix",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue