summaryrefslogtreecommitdiff
path: root/manifests/base.pp
diff options
context:
space:
mode:
authorChristian G. Warden <cwarden@xerus.org>2012-02-01 16:56:49 -0800
committerMicah Anderson <micah@riseup.net>2012-04-18 12:27:17 -0400
commit32da5faa192dc00f781bdb679aafbc0f41ac180d (patch)
tree09d72933dc14f7d89c8119fc7d833cb5e1b4b995 /manifests/base.pp
parent8e364f5929156827bc767d828b9c56b7144758fc (diff)
Fully qualify facter variables to suppress warnings
merge conflict due to immerda's branch not being up-to-date on the bot
Diffstat (limited to 'manifests/base.pp')
-rw-r--r--manifests/base.pp12
1 files changed, 6 insertions, 6 deletions
diff --git a/manifests/base.pp b/manifests/base.pp
index e770cf8..3e3f0e1 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -18,9 +18,9 @@ class nagios::base {
file { 'nagios_main_cfg':
path => "${nagios::defaults::vars::int_nagios_cfgdir}/nagios.cfg",
source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios.cfg",
- "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios.cfg",
+ "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios.cfg",
"puppet:///modules/site-nagios/configs/nagios.cfg",
- "puppet:///modules/nagios/configs/${operatingsystem}/nagios.cfg",
+ "puppet:///modules/nagios/configs/${::operatingsystem}/nagios.cfg",
"puppet:///modules/nagios/configs/nagios.cfg" ],
notify => Service['nagios'],
mode => 0644, owner => root, group => root;
@@ -36,9 +36,9 @@ class nagios::base {
file { 'nagios_cgi_cfg':
path => "${nagios::defaults::vars::int_nagios_cfgdir}/cgi.cfg",
source => [ "puppet:///modules/site-nagios/configs/${fqdn}/cgi.cfg",
- "puppet:///modules/site-nagios/configs/${operatingsystem}/cgi.cfg",
+ "puppet:///modules/site-nagios/configs/${::operatingsystem}/cgi.cfg",
"puppet:///modules/site-nagios/configs/cgi.cfg",
- "puppet:///modules/nagios/configs/${operatingsystem}/cgi.cfg",
+ "puppet:///modules/nagios/configs/${::operatingsystem}/cgi.cfg",
"puppet:///modules/nagios/configs/cgi.cfg" ],
mode => '0644', owner => 'root', group => 0,
notify => Service['apache'],
@@ -62,8 +62,8 @@ class nagios::base {
file { 'nagios_private_resource_cfg':
path => "${nagios::defaults::vars::int_nagios_cfgdir}/private/resource.cfg",
- source => [ "puppet:///modules/site-nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}",
- "puppet:///modules/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}" ],
+ source => [ "puppet:///modules/site-nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}",
+ "puppet:///modules/nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}" ],
notify => Service['nagios'],
owner => root, group => nagios, mode => '0640';
}