diff options
| author | Micah Anderson <micah@riseup.net> | 2010-10-17 19:11:16 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2010-10-17 19:11:16 -0400 |
| commit | 5cb689737e367ce751956575b11b0d46bf241f91 (patch) | |
| tree | c0f9bddd00f66262e8d38ebb31fd74986b95ba1f /manifests/defaults/templates.pp | |
| parent | 0ab822f209fd5b4e703f7608b375ba5780fa5364 (diff) | |
| parent | 25e0862d29da6b99b1195942cc994780fbbf68ab (diff) | |
Merge remote branch 'ng/master'
Diffstat (limited to 'manifests/defaults/templates.pp')
| -rw-r--r-- | manifests/defaults/templates.pp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/manifests/defaults/templates.pp b/manifests/defaults/templates.pp index 752ba60..c97eee4 100644 --- a/manifests/defaults/templates.pp +++ b/manifests/defaults/templates.pp @@ -1,12 +1,13 @@ class nagios::defaults::templates { + include nagios::defaults::vars file { 'nagios_templates': - path => "${nagios_cfgdir}/conf.d/nagios_templates.cfg", - source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios_templates.cfg", - "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios_templates.cfg", - "puppet://$server/modules/site-nagios/configs/nagios_templates.cfg", - "puppet://$server/modules/nagios/configs/${operatingsystem}/nagios_templates.cfg", - "puppet://$server/modules/nagios/configs/nagios_templates.cfg" ], + 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/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; } |