diff options
| -rw-r--r-- | files/configs/cgi.cfg.Centos (renamed from files/configs/cgi.cfg) | 0 | ||||
| -rw-r--r-- | files/configs/commands.cfg.Centos (renamed from files/configs/commands.cfg) | 0 | ||||
| -rw-r--r-- | files/configs/nagios.cfg.Centos (renamed from files/configs/nagios.cfg) | 0 | ||||
| -rw-r--r-- | files/configs/private/resource.cfg.i386.Centos (renamed from files/configs/private/resource.cfg.i386) | 0 | ||||
| -rw-r--r-- | files/configs/private/resource.cfg.x86_64.Centos (renamed from files/configs/private/resource.cfg.x86_64) | 0 | ||||
| -rw-r--r-- | files/configs/puppet_cfgpaths.cfg.Centos (renamed from files/configs/puppet_cfgpaths.cfg) | 0 | ||||
| -rw-r--r-- | manifests/init.pp | 18 |
7 files changed, 8 insertions, 10 deletions
diff --git a/files/configs/cgi.cfg b/files/configs/cgi.cfg.Centos index cd625d4..cd625d4 100644 --- a/files/configs/cgi.cfg +++ b/files/configs/cgi.cfg.Centos diff --git a/files/configs/commands.cfg b/files/configs/commands.cfg.Centos index 2b1889c..2b1889c 100644 --- a/files/configs/commands.cfg +++ b/files/configs/commands.cfg.Centos diff --git a/files/configs/nagios.cfg b/files/configs/nagios.cfg.Centos index 7027c90..7027c90 100644 --- a/files/configs/nagios.cfg +++ b/files/configs/nagios.cfg.Centos diff --git a/files/configs/private/resource.cfg.i386 b/files/configs/private/resource.cfg.i386.Centos index 0ccf2e1..0ccf2e1 100644 --- a/files/configs/private/resource.cfg.i386 +++ b/files/configs/private/resource.cfg.i386.Centos diff --git a/files/configs/private/resource.cfg.x86_64 b/files/configs/private/resource.cfg.x86_64.Centos index b9f0841..b9f0841 100644 --- a/files/configs/private/resource.cfg.x86_64 +++ b/files/configs/private/resource.cfg.x86_64.Centos diff --git a/files/configs/puppet_cfgpaths.cfg b/files/configs/puppet_cfgpaths.cfg.Centos index 44294b4..44294b4 100644 --- a/files/configs/puppet_cfgpaths.cfg +++ b/files/configs/puppet_cfgpaths.cfg.Centos diff --git a/manifests/init.pp b/manifests/init.pp index a7b4538..8db2b3e 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -48,8 +48,8 @@ class nagios::base { path => "/etc/nagios/nagios.cfg", source => [ "puppet://$server/files/nagios/${fqdn}/nagios.cfg", "puppet://$server/files/nagios/nagios.cfg", - "puppet://$server/nagios/${operatingsystem}/nagios.cfg", - "puppet://$server/nagios/nagios.cfg" ], + "puppet://$server/nagios/configs/nagios.cfg.${operatingsystem}", + "puppet://$server/nagios/configs/nagios.cfg" ], notify => Service[nagios], mode => 0644, owner => root, group => root; } @@ -57,20 +57,18 @@ class nagios::base { file {nagios_puppet_cfg_paths: path => "/etc/nagios/puppet_cfgpaths.cfg", source => [ "puppet://$server/files/nagios/${fqdn}/puppet_cfgpaths.cfg", - "puppet://$server/files/nagios/${operatingsystem}/puppet_cfgpaths.cfg", "puppet://$server/files/nagios/puppet_cfgpaths.cfg", - "puppet://$server/nagios/${operatingsystem}/puppet_cfgpaths.cfg", - "puppet://$server/nagios/puppet_cfgpaths.cfg" ], + "puppet://$server/nagios/configs/puppet_cfgpaths.cfg.${operatingsystem}", + "puppet://$server/nagios/configs/puppet_cfgpaths.cfg" ], notify => Service[nagios], mode => 0644, owner => root, group => root; } file { nagios_cgi_cfg: path => "/etc/nagios/cgi.cfg", source => [ "puppet://$server/files/nagios/${fqdn}/cgi.cfg", - "puppet://$server/files/nagios/${operatingsystem}/cgi.cfg", "puppet://$server/files/nagios/cgi.cfg", - "puppet://$server/nagios/${operatingsystem}/cgi.cfg", - "puppet://$server/nagios/cgi.cfg" ], + "puppet://$server/nagios/configs/cgi.cfg.${operatingsystem}", + "puppet://$server/nagios/configs/cgi.cfg" ], owner => 'root', group => 0, mode => '0644', @@ -155,7 +153,7 @@ class nagios::centos inherits nagios::base { # don't forget it to add to the puppet paths file { nagios_commands_cfg: path => "/etc/nagios/commands.cfg", - source => "puppet://$server/nagios/${operatingsystem}/commands.cfg" , + source => "puppet://$server/nagios/configs/commands.cfg.${operatingsystem}" , owner => 'root', group => 0, mode => '0644', @@ -169,7 +167,7 @@ class nagios::centos inherits nagios::base { mode => '0750', owner => root, group => nagios; } file{"/etc/nagios/private/resource.cfg": - source => "puppet://$server/nagios/${operatingsystem}/private/resource.cfg.${architecture}", + source => "puppet://$server/nagios/configs/private/resource.cfg.${operatingsystem}.${architecture}", owner => root, group => nagios, mode => '0640'; } } |