Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

puppet: Switch from $::fqdn to non-legacy $::networking.

This commit is contained in:
Alex Vandiver 2022-02-14 16:30:09 -08:00 committed by Alex Vandiver
parent bb4c0799cc
commit f2f4462e71
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
puppet/zulip/manifests/postfix_localmail.pp
View File

@ -2,10 +2,11 @@ class zulip::postfix_localmail {
include zulip::snakeoil
$postfix_packages = [ 'postfix', ]
if $::fqdn == '' {
$fqdn = $::networking['fqdn']
if $fqdn == '' {
fail('Your system does not have a fully-qualified domain name defined. See hostname(1).')
}
$postfix_mailname = zulipconf('postfix', 'mailname', $::fqdn)
$postfix_mailname = zulipconf('postfix', 'mailname', $fqdn)
package { $postfix_packages:
ensure => 'installed',
require => File['/etc/mailname'],
@ -20,7 +21,7 @@ class zulip::postfix_localmail {
mode => '0644',
owner => root,
group => root,
content => $::fqdn,
content => $fqdn,
}
file {'/etc/postfix/main.cf':