mirror of https://github.com/zulip/zulip.git
puppet: Fix use of under-scoped variables.
This commit is contained in:
parent
6e55aa2ce6
commit
19cee30bf8
|
@ -23,7 +23,7 @@ class zulip::base {
|
|||
]
|
||||
package { $base_packages: ensure => "installed" }
|
||||
|
||||
$release_name = $operatingsystemrelease ? {
|
||||
$release_name = $::operatingsystemrelease ? {
|
||||
# Debian releases
|
||||
/7.[0-9]*/ => 'wheezy',
|
||||
/8.[0-9]*/ => 'jessie',
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
class zulip::postfix_localmail {
|
||||
$postfix_packages = [ "postfix", ]
|
||||
|
||||
if $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'],
|
||||
|
@ -18,7 +18,7 @@ class zulip::postfix_localmail {
|
|||
mode => '0644',
|
||||
owner => root,
|
||||
group => root,
|
||||
content => $fqdn,
|
||||
content => $::fqdn,
|
||||
}
|
||||
|
||||
file {'/etc/postfix/main.cf':
|
||||
|
|
|
@ -7,7 +7,7 @@ class zulip::supervisor {
|
|||
# don't want/need supervisor to be started/stopped
|
||||
# /bin/true is used as a decoy command, to maintain compatibility with other
|
||||
# code using the supervisor service.
|
||||
if $ignoreSupervisorService != undef and $ignoreSupervisorService {
|
||||
if $::ignoreSupervisorService != undef and $::ignoreSupervisorService {
|
||||
service { "supervisor":
|
||||
ensure => running,
|
||||
require => [
|
||||
|
|
Loading…
Reference in New Issue