From 77f209d3833945a5dbdd2b0d8839e09edd3104dc Mon Sep 17 00:00:00 2001 From: "Christian G. Warden" Date: Tue, 13 Dec 2011 11:45:31 -0800 Subject: [PATCH] Fully-qualify facter variables Fully-qualify facter variables, $::kernel and $::operatingsystem. --- manifests/package.pp | 2 +- manifests/params.pp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/package.pp b/manifests/package.pp index 83ceae1..2751f18 100644 --- a/manifests/package.pp +++ b/manifests/package.pp @@ -17,7 +17,7 @@ class nginx::package { anchor { 'nginx::package::begin': } anchor { 'nginx::package::end': } - case $operatingsystem { + case $::operatingsystem { centos,fedora,rhel: { class { 'nginx::package::redhat': require => Anchor['nginx::package::begin'], diff --git a/manifests/params.pp b/manifests/params.pp index 7172b8a..5ea00c1 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -41,15 +41,15 @@ class nginx::params { $nx_proxy_read_timeout = '90' $nx_proxy_buffers = '32 4k' - $nx_logdir = $kernel ? { + $nx_logdir = $::kernel ? { /(?i-mx:linux)/ => '/var/log/nginx', } - $nx_pid = $kernel ? { + $nx_pid = $::kernel ? { /(?i-mx:linux)/ => '/var/run/nginx.pid', } - $nx_daemon_user = $operatingsystem ? { + $nx_daemon_user = $::operatingsystem ? { /(?i-mx:debian|ubuntu)/ => 'www-data', /(?i-mx:fedora|rhel|centos|suse|opensuse)/ => 'nginx', }