diff options
| author | mh <mh@immerda.ch> | 2009-11-14 13:30:09 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-11-14 13:30:09 +0100 |
| commit | 462de263334d949c41972e2dc949d3d205b8cc0e (patch) | |
| tree | 851ea5abaf84be5580672da1958ce115b879b107 /manifests | |
| parent | ffc96e36f6e0326f3aa0d484fbecb610281e4390 (diff) | |
update to new 0.25.x style
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/base.pp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/manifests/base.pp b/manifests/base.pp index 29d0596..bd21a84 100644 --- a/manifests/base.pp +++ b/manifests/base.pp @@ -16,7 +16,7 @@ class nagios::base { # manage nagios cfg files file {nagios_cfg_dir: - path => "/etc/nagios/", + path => '/etc/nagios', source => "puppet://$server/modules/common/empty", ensure => directory, recurse => true, @@ -27,9 +27,9 @@ class nagios::base { # this file should contain all the nagios_puppet-paths: file {nagios_main_cfg: path => "/etc/nagios/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", + 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], @@ -37,9 +37,9 @@ class nagios::base { } file { nagios_cgi_cfg: path => "/etc/nagios/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", + 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" ], owner => 'root', @@ -50,7 +50,7 @@ class nagios::base { file {"/etc/nagios/htpasswd.users": source => [ - "puppet://$server/files/nagios/htpasswd.users", + "puppet://$server/modules/site-nagios/htpasswd.users", "puppet://$server/modules/nagios/htpasswd.users" ], mode => 0640, owner => root, group => apache; } |