diff options
| author | mh <mh@immerda.ch> | 2010-08-11 15:57:58 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-08-11 15:57:58 +0200 |
| commit | 01bb8dfee9c3981994d1697fc96470798445a050 (patch) | |
| tree | dcd4266d6eeb8dc48ae1b69aacea53594e6560a8 /manifests/defaults/templates.pp | |
| parent | 33b091b896fbb0b54ee9968c452ef2a8867893d8 (diff) | |
| parent | a5d8b5b8b1f4d5afcb549e28bf1eef12169b81c7 (diff) | |
Merge branch 'master' of git.puppet.immerda.ch:module-nagios
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 5a3d23d..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::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; } |