From 5b7f23c7868e420fcb86f88bdd737fb02c471bf7 Mon Sep 17 00:00:00 2001
From: 12ww1160 <12ww1160@confdroid.com>
Date: Thu, 19 Feb 2026 16:30:11 +0100
Subject: [PATCH] OP#436 add main dirs

---
 manifests/main/dirs.pp    | 66 +++++++++++++++++++--------------------
 manifests/server/files.pp |  4 +--
 2 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/manifests/main/dirs.pp b/manifests/main/dirs.pp
index 57c103d..2401415 100644
--- a/manifests/main/dirs.pp
+++ b/manifests/main/dirs.pp
@@ -22,6 +22,32 @@ class confdroid_nagios::main::dirs (
       seluser  => system_u,
     }
 
+    # /etc/nagios/objects
+    file { $ng_objects_dir:
+      ensure   => directory,
+      path     => $ng_objects_dir,
+      owner    => 'root',
+      group    => 'nagios',
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_etc_t,
+      seluser  => system_u,
+    }
+
+    # /etc/nagios/private
+    file { $ng_private_dir:
+      ensure   => directory,
+      path     => $ng_private_dir,
+      owner    => 'root',
+      group    => 'nagios',
+      mode     => '0750',
+      selrange => s0,
+      selrole  => object_r,
+      seltype  => nagios_etc_t,
+      seluser  => system_u,
+    }
+
   # /usr/lib64/nagios dir required for plugins
 #  file { $ng_lib_dir:
 #    ensure   => directory,
@@ -39,8 +65,8 @@ class confdroid_nagios::main::dirs (
 #  file { $ng_spool_dir:
 #    ensure   => directory,
 #    path     => $ng_spool_dir,
-#    owner    => $ng_user,
-#    group    => $ng_user,
+#    owner    => 'nagios',
+#    group    => 'nagios',
 #    mode     => '0755',
 #    selrange => s0,
 #    selrole  => object_r,
@@ -54,33 +80,7 @@ class confdroid_nagios::main::dirs (
 #      ensure   => directory,
 #      path     => $ng_conf_d_dir,
 #      owner    => 'root',
-#      group    => $ng_user,
-#      mode     => '0750',
-#      selrange => s0,
-#      selrole  => object_r,
-#      seltype  => nagios_etc_t,
-#      seluser  => system_u,
-#    }
-
-    # /etc/nagios/objects
-#    file { $ng_objects_dir:
-#      ensure   => directory,
-#      path     => $ng_objects_dir,
-#      owner    => 'root',
-#      group    => $ng_user,
-#      mode     => '0750',
-#      selrange => s0,
-#      selrole  => object_r,
-#      seltype  => nagios_etc_t,
-#      seluser  => system_u,
-#    }
-
-    # /etc/nagios/private
-#    file { $ng_private_dir:
-#      ensure   => directory,
-#      path     => $ng_private_dir,
-#      owner    => 'root',
-#      group    => $ng_user,
+#      group    => 'nagios',
 #      mode     => '0750',
 #      selrange => s0,
 #      selrole  => object_r,
@@ -105,8 +105,8 @@ class confdroid_nagios::main::dirs (
 #    file { $ng_log_dir:
 #      ensure   => directory,
 #      path     => $ng_log_dir,
-#      owner    => $ng_user,
-#      group    => $ng_user,
+#      owner    => 'nagios',
+#      group    => 'nagios',
 #      mode     => '0750',
 #      selrange => s0,
 #      selrole  => object_r,
@@ -118,8 +118,8 @@ class confdroid_nagios::main::dirs (
 #    file { $ng_log_archives:
 #      ensure   => directory,
 #      path     => $ng_log_archives,
-#      owner    => $ng_user,
-#      group    => $ng_user,
+#      owner    => 'nagios',
+#      group    => 'nagios',
 #      mode     => '0750',
 #      selrange => s0,
 #      selrole  => object_r,
diff --git a/manifests/server/files.pp b/manifests/server/files.pp
index 469b095..3fcc493 100644
--- a/manifests/server/files.pp
+++ b/manifests/server/files.pp
@@ -10,8 +10,8 @@ class confdroid_nagios::server::files (
 #  if $ng_nagios_server == $fqdn {
 #    file { $ng_nagios_cfg_file:
 #      ensure  => file,
-#      owner   => $ng_user,
-#      group   => $ng_user,
+#      owner   => 'nagios',
+#      group   => 'nagios',
 #      mode    => '0644',
 #      content => template($ng_nagios_cfg_erb),
 #      notify  => Service[$ng_nagios_service],