Recommit for updates in build 61

This commit is contained in:
Jenkins Server
2026-02-19 16:31:22 +01:00
parent f482df1bd4
commit 9334859591
2 changed files with 35 additions and 35 deletions

View File

@@ -315,6 +315,32 @@ class confdroid_nagios::main::dirs (
seluser => system_u, 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 # /usr/lib64/nagios dir required for plugins
# file { $ng_lib_dir: # file { $ng_lib_dir:
# ensure => directory, # ensure => directory,
@@ -332,8 +358,8 @@ class confdroid_nagios::main::dirs (
# file { $ng_spool_dir: # file { $ng_spool_dir:
# ensure => directory, # ensure => directory,
# path => $ng_spool_dir, # path => $ng_spool_dir,
# owner => $ng_user, # owner => 'nagios',
# group => $ng_user, # group => 'nagios',
# mode => '0755', # mode => '0755',
# selrange => s0, # selrange => s0,
# selrole => object_r, # selrole => object_r,
@@ -347,33 +373,7 @@ class confdroid_nagios::main::dirs (
# ensure => directory, # ensure => directory,
# path => $ng_conf_d_dir, # path => $ng_conf_d_dir,
# owner => 'root', # owner => 'root',
# group => $ng_user, # group => 'nagios',
# 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,
# mode => '0750', # mode => '0750',
# selrange => s0, # selrange => s0,
# selrole => object_r, # selrole => object_r,
@@ -398,8 +398,8 @@ class confdroid_nagios::main::dirs (
# file { $ng_log_dir: # file { $ng_log_dir:
# ensure => directory, # ensure => directory,
# path => $ng_log_dir, # path => $ng_log_dir,
# owner => $ng_user, # owner => 'nagios',
# group => $ng_user, # group => 'nagios',
# mode => '0750', # mode => '0750',
# selrange => s0, # selrange => s0,
# selrole => object_r, # selrole => object_r,
@@ -411,8 +411,8 @@ class confdroid_nagios::main::dirs (
# file { $ng_log_archives: # file { $ng_log_archives:
# ensure => directory, # ensure => directory,
# path => $ng_log_archives, # path => $ng_log_archives,
# owner => $ng_user, # owner => 'nagios',
# group => $ng_user, # group => 'nagios',
# mode => '0750', # mode => '0750',
# selrange => s0, # selrange => s0,
# selrole => object_r, # selrole => object_r,

View File

@@ -127,8 +127,8 @@ class confdroid_nagios::server::files (
# if $ng_nagios_server == $fqdn { # if $ng_nagios_server == $fqdn {
# file { $ng_nagios_cfg_file: # file { $ng_nagios_cfg_file:
# ensure => file, # ensure => file,
# owner => $ng_user, # owner => 'nagios',
# group => $ng_user, # group => 'nagios',
# mode => '0644', # mode => '0644',
# content => template($ng_nagios_cfg_erb), # content => template($ng_nagios_cfg_erb),
# notify => Service[$ng_nagios_service], # notify => Service[$ng_nagios_service],