diff options
author | mh <mh@immerda.ch> | 2012-02-02 10:12:16 +0100 |
---|---|---|
committer | mh <mh@immerda.ch> | 2012-02-02 10:12:16 +0100 |
commit | 9d1e4d707694489b91a4c5b5be7af44cf9b9493d (patch) | |
tree | dc75d078b532748c9632575b62480f7deb9dab0b /manifests/defaults/templates.pp | |
parent | 10390a88051ea4e3ad0ded1cbf0cb93df553fe78 (diff) | |
parent | 108a2f0483b39901a0cbb321a9de63a2cf3c49ac (diff) |
Merge remote-tracking branch 'github/master'
Diffstat (limited to 'manifests/defaults/templates.pp')
-rw-r--r-- | manifests/defaults/templates.pp | 4 |
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; |