diff options
| author | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-02 11:03:01 -0500 |
|---|---|---|
| committer | Jerome Charaoui <jcharaoui@cmaisonneuve.qc.ca> | 2009-12-02 11:03:01 -0500 |
| commit | 65f58d903aa2a6a7c4bf4aa16608367af222d002 (patch) | |
| tree | 04ed821a2ea5e3ba00c960dd9e5c3b10f67a8c6b | |
| parent | 5c506591a0fb48da1f5b43582c242c196b4b32c7 (diff) | |
don't use /files/, that is un-0.25.x-ish
| -rw-r--r-- | manifests/base.pp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 30c3018..8f0a03c 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -26,30 +26,30 @@ class nagios::base { # this file should contain all the nagios_puppet-paths: file { 'nagios_main_cfg': path => "${nagios_cfg_dir}/nagios.cfg", - source => [ "puppet://$server/files/nagios/configs/${fqdn}/nagios.cfg", - "puppet://$server/files/nagios/configs/${operatingsystem}/nagios.cfg", - "puppet://$server/files/nagios/configs/nagios.cfg", - "puppet://$server/nagios/configs/${operatingsystem}/nagios.cfg", - "puppet://$server/nagios/configs/nagios.cfg" ], + source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/nagios.cfg", + "puppet://$server/modules/site-nagios/configs/${operatingsystem}/nagios.cfg", + "puppet://$server/modules/site-nagios/configs/nagios.cfg", + "puppet://$server/modules/nagios/configs/${operatingsystem}/nagios.cfg", + "puppet://$server/modules/nagios/configs/nagios.cfg" ], notify => Service['nagios'], mode => 0644, owner => root, group => root; } file { 'nagios_cgi_cfg': path => "${nagios_cfg_dir}/cgi.cfg", - source => [ "puppet://$server/files/nagios/configs/${fqdn}/cgi.cfg", - "puppet://$server/files/nagios/configs/${operatingsystem}/cgi.cfg", - "puppet://$server/files/nagios/configs/cgi.cfg", - "puppet://$server/nagios/configs/${operatingsystem}/cgi.cfg", - "puppet://$server/nagios/configs/cgi.cfg" ], + source => [ "puppet://$server/modules/site-nagios/configs/${fqdn}/cgi.cfg", + "puppet://$server/modules/site-nagios/configs/${operatingsystem}/cgi.cfg", + "puppet://$server/modules/site-nagios/configs/cgi.cfg", + "puppet://$server/modules/nagios/configs/${operatingsystem}/cgi.cfg", + "puppet://$server/modules/nagios/configs/cgi.cfg" ], mode => '0644', owner => 'root', group => 0, notify => Service['apache'], } file { 'nagios_htpasswd': path => "${nagios_cfg_dir}/htpasswd.users", - source => [ "puppet://$server/files/nagios/htpasswd.users", - "puppet://$server/nagios/htpasswd.users" ], + source => [ "puppet://$server/modules/site-nagios/nagios/htpasswd.users", + "puppet://$server/modules/nagios/htpasswd.users" ], mode => 0640, owner => root, group => apache; } |