summaryrefslogtreecommitdiff
path: root/manifests/defaults/templates.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/defaults/templates.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/defaults/templates.pp')
-rw-r--r--manifests/defaults/templates.pp4
1 files changed, 2 insertions, 2 deletions
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp
index c97eee4..aec97c0 100644
--- a/manifests/defaults/templates.pp
+++ b/manifests/defaults/templates.pp
@@ -4,9 +4,9 @@ class nagios::defaults::templates {
file { 'nagios_templates':
path => "${nagios::defaults::vars::int_nagios_cfgdir}/conf.d/nagios_templates.cfg",
source => [ "puppet:///modules/site-nagios/configs/${fqdn}/nagios_templates.cfg",
- "puppet:///modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg",
+ "puppet:///modules/site-nagios/configs/${::operatingsystem}/nagios_templates.cfg",
"puppet:///modules/site-nagios/configs/nagios_templates.cfg",
- "puppet:///modules/nagios/configs/${operatingsystem}/nagios_templates.cfg",
+ "puppet:///modules/nagios/configs/${::operatingsystem}/nagios_templates.cfg",
"puppet:///modules/nagios/configs/nagios_templates.cfg" ],
notify => Service['nagios'],
mode => 0644, owner => root, group => root;