diff options
| author | mh <mh@immerda.ch> | 2010-07-01 04:00:06 +0200 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2010-07-01 04:00:06 +0200 |
| commit | 481a621f2411fc6cb87521760897f5c5c6f47ea9 (patch) | |
| tree | 839ca859255c1c3fd05b5a9f0f3dc90d425e862c /manifests/base.pp | |
| parent | 5761d798995156ab89f3e6dad01daa9ba1fb66ff (diff) | |
| parent | 7e4078a6c038aad2e654122f6376ab3d49b25778 (diff) | |
Merge remote branch 'riseup/master'
Diffstat (limited to 'manifests/base.pp')
| -rw-r--r-- | manifests/base.pp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 47ef9f3..d609196 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -54,7 +54,8 @@ class nagios::base { file { 'nagios_private_resource_cfg': path => "${nagios_cfgdir}/private/resource.cfg", - source => "puppet://$server/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}", + source => [ "puppet://$server/modules/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}", + "puppet://$server/modules/site-nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}" ], notify => Service['nagios'], owner => root, group => nagios, mode => '0640'; } |