From f2e75a6e5143ad794275ee7c1c14577d787095cb Mon Sep 17 00:00:00 2001
From: Gabriel Filion <gabster@lelutin.ca>
Date: Sun, 19 Apr 2015 15:18:46 -0400
Subject: Only use the private directory on CentOS

Debian and ubuntu have their resource.cfg file placed in /etc/nagios3/
and when it's absent it can cause issues with the package (because the
package is badly done).
---
 files/configs/Debian/nagios.cfg |  2 +-
 manifests/base.pp               | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/files/configs/Debian/nagios.cfg b/files/configs/Debian/nagios.cfg
index 8eae393..41a2e3c 100644
--- a/files/configs/Debian/nagios.cfg
+++ b/files/configs/Debian/nagios.cfg
@@ -67,7 +67,7 @@ precached_object_file=/var/lib/nagios3/objects.precache
 # defined as macros in this file and restrictive permissions (600)
 # can be placed on this file.
 
-resource_file=/etc/nagios3/private/resource.cfg
+resource_file=/etc/nagios3/resource.cfg
 
 
 
diff --git a/manifests/base.pp b/manifests/base.pp
index 0f8b777..8f99564 100644
--- a/manifests/base.pp
+++ b/manifests/base.pp
@@ -44,17 +44,26 @@ class nagios::base {
         mode => 0640, owner => root, group => apache;
     }
 
-    file { 'nagios_private':
-        path => "${nagios::defaults::vars::int_cfgdir}/private/",
-        ensure => directory,
-        purge => true,
-        recurse => true,
-        notify => Service['nagios'],
-        mode => '0750', owner => root, group => nagios;
+    if $::operatingsystem == 'Centos' {
+      file { 'nagios_private':
+          ensure  => directory,
+          path    => "${nagios::defaults::vars::int_cfgdir}/private/",
+          purge   => true,
+          recurse => true,
+          mode    => '0750',
+          owner   => 'root',
+          group   => 'nagios',
+          notify  => Service['nagios'],
+      }
+
+      $resource_cfg_dir = "${nagios::defaults::vars::int_cfgdir}/private"
+    }
+    else {
+      $resource_cfg_dir = $nagios::defaults::vars::int_cfgdir
     }
 
     file { 'nagios_private_resource_cfg':
-        path => "${nagios::defaults::vars::int_cfgdir}/private/resource.cfg",
+        path   => "${resource_cfg_dir}/resource.cfg",
         source => [ "puppet:///modules/site_nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}",
                     "puppet:///modules/nagios/configs/${::operatingsystem}/private/resource.cfg.${::architecture}" ],
         notify => Service['nagios'],
-- 
cgit v1.2.3