move puppet nagios resources down into conf.d

1 files changed, 31 insertions, 41 deletions

diff --git a/manifests/base.pp b/manifests/base.pp
index 4ee8097..81cd3cb 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -14,7 +14,7 @@ class nagios::base {
 
     # this file should contain all the nagios_puppet-paths:
     file { 'nagios_main_cfg':
-            path => "${nagios_cfg_dir}/nagios.cfg",
+            path => "${nagios_cfgdir}/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",
@@ -25,7 +25,7 @@ class nagios::base {
     }    
 
     file { 'nagios_cgi_cfg':
-        path => "${nagios_cfg_dir}/cgi.cfg",
+        path => "${nagios_cfgdir}/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",
@@ -36,14 +36,14 @@ class nagios::base {
     }
 
     file { 'nagios_htpasswd':
-        path => "${nagios_cfg_dir}/htpasswd.users",
+        path => "${nagios_cfgdir}/htpasswd.users",
         source => [ "puppet://$server/modules/site-nagios/htpasswd.users",
                     "puppet://$server/modules/nagios/htpasswd.users" ],
         mode => 0640, owner => root, group => apache;
     }
 
     file { 'nagios_private':
-        path => "${nagios_cfg_dir}/private/",
+        path => "${nagios_cfgdir}/private/",
         source => "puppet://$server/modules/common/empty",
         ensure => directory,
         purge => true,
@@ -53,22 +53,12 @@ class nagios::base {
     }
 
     file { 'nagios_private_resource_cfg':
-        path => "${nagios_cfg_dir}/private/resource.cfg",
+        path => "${nagios_cfgdir}/private/resource.cfg",
         source => "puppet://$server/nagios/configs/${operatingsystem}/private/resource.cfg.${architecture}",
         notify => Service['nagios'],
         owner => root, group => nagios, mode => '0640';
     }
 
-    file { 'nagios_defaults':
-        path => "${nagios_cfg_dir}/defaults/",
-        source => "puppet://$server/modules/common/empty",
-        ensure => directory,
-        purge => true,
-        recurse => true,
-        notify => Service['nagios'],
-        mode => '0755', owner => root, group => nagios;
-    }
-
     Nagios_command <<||>>
     Nagios_contact <<||>>
     Nagios_contactgroup <<||>>
@@ -83,66 +73,66 @@ class nagios::base {
     Nagios_timeperiod <<||>>
 
     Nagios_command <||> {
-        target => "${nagios_cfg_dir}/nagios_command.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_command.cfg",
         notify => Service['nagios'],
     }
     Nagios_contact <||> {
-        target => "${nagios_cfg_dir}/nagios_contact.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_contact.cfg",
         notify => Service['nagios'],
     }
     Nagios_contactgroup <||> {
-        target => "${nagios_cfg_dir}/nagios_contactgroup.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_contactgroup.cfg",
         notify => Service['nagios'],
     }
     Nagios_host <||> {
-        target => "${nagios_cfg_dir}/nagios_host.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_host.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostextinfo <||> {
-        target => "${nagios_cfg_dir}/nagios_hostextinfo.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostgroup <||> {
-        target => "${nagios_cfg_dir}/nagios_hostgroup.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_hostgroup.cfg",
         notify => Service['nagios'],
     }
     Nagios_hostgroupescalation <||> {
-        target => "${nagios_cfg_dir}/nagios_hostgroupescalation.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_hostgroupescalation.cfg",
         notify => Service['nagios'],
     }
     Nagios_service <||> {
-        target => "${nagios_cfg_dir}/nagios_service.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_service.cfg",
         notify => Service['nagios'],
     }
     Nagios_servicedependency <||> {
-        target => "${nagios_cfg_dir}/nagios_servicedependency.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_servicedependency.cfg",
         notify => Service['nagios'],
     }
     Nagios_serviceescalation <||> {
-        target => "${nagios_cfg_dir}/nagios_serviceescalation.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg",
         notify => Service['nagios'],
     }
     Nagios_serviceextinfo <||> {
-        target => "${nagios_cfg_dir}/nagios_serviceextinfo.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
         notify => Service['nagios'],
     }
     Nagios_timeperiod <||> {
-        target => "${nagios_cfg_dir}/nagios_timeperiod.cfg",
+        target => "${nagios_cfgdir}/conf.d/nagios_timeperiod.cfg",
         notify => Service['nagios'],
     }
 
-    file{[ "${nagios_cfg_dir}/nagios_command.cfg", 
-           "${nagios_cfg_dir}/nagios_contact.cfg", 
-           "${nagios_cfg_dir}/nagios_contactgroup.cfg",
-           "${nagios_cfg_dir}/nagios_host.cfg",
-           "${nagios_cfg_dir}/nagios_hostextinfo.cfg",
-           "${nagios_cfg_dir}/nagios_hostgroup.cfg",
-           "${nagios_cfg_dir}/nagios_hostgroupescalation.cfg",
-           "${nagios_cfg_dir}/nagios_service.cfg",
-           "${nagios_cfg_dir}/nagios_servicedependency.cfg",
-           "${nagios_cfg_dir}/nagios_serviceescalation.cfg",
-           "${nagios_cfg_dir}/nagios_serviceextinfo.cfg",
-           "${nagios_cfg_dir}/nagios_timeperdiod.cfg" ]:
+    file{[ "${nagios_cfgdir}/conf.d/nagios_command.cfg", 
+           "${nagios_cfgdir}/conf.d/nagios_contact.cfg", 
+           "${nagios_cfgdir}/conf.d/nagios_contactgroup.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_host.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_hostextinfo.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_hostgroup.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_hostgroupescalation.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_service.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_servicedependency.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_serviceescalation.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_serviceextinfo.cfg",
+           "${nagios_cfgdir}/conf.d/nagios_timeperdiod.cfg" ]:
         ensure => file,
         replace => false,
         notify => Service['nagios'],
@@ -151,8 +141,8 @@ class nagios::base {
 
     # manage nagios cfg files
     # must be defined after exported resource overrides and cfg file defs
-    file { 'nagios_cfg_dir':
-        path => "${nagios_cfg_dir}/",
+    file { 'nagios_cfgdir':
+        path => "${nagios_cfgdir}/",
         source => "puppet://$server/modules/common/empty",
         ensure => directory,
         recurse => true,