Recommit for updates in build 47

This commit is contained in:
Jenkins Server
2026-02-14 19:41:42 +01:00
parent f12eb43a39
commit 3e19179245
4 changed files with 355 additions and 2273 deletions

View File

@@ -300,188 +300,188 @@ class confdroid_nagios::main::dirs (
require confdroid_nagios::main::user require confdroid_nagios::main::user
# main directory # main directory
file { $ng_main_dir: # file { $ng_main_dir:
ensure => directory, # ensure => directory,
path => $ng_main_dir, # path => $ng_main_dir,
owner => 'root', # owner => 'root',
group => 'root', # group => 'root',
mode => '0755', # mode => '0755',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_etc_t, # seltype => nagios_etc_t,
seluser => system_u, # 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,
path => $ng_lib_dir, # path => $ng_lib_dir,
owner => 'root', # owner => 'root',
group => 'root', # group => 'root',
mode => '0755', # mode => '0755',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => lib_t, # seltype => lib_t,
seluser => system_u, # seluser => system_u,
} # }
# /var/spool/nagios # /var/spool/nagios
file { $ng_spool_dir: # file { $ng_spool_dir:
ensure => directory, # ensure => directory,
path => $ng_spool_dir, # path => $ng_spool_dir,
owner => $ng_user, # owner => $ng_user,
group => $ng_user, # group => $ng_user,
mode => '0755', # mode => '0755',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_spool_t, # seltype => nagios_spool_t,
seluser => system_u, # seluser => system_u,
} # }
if $fqdn == $ng_nagios_server { # if $fqdn == $ng_nagios_server {
# /etc/nagios/conf.d # /etc/nagios/conf.d
file { $ng_conf_d_dir: # file { $ng_conf_d_dir:
ensure => directory, # ensure => directory,
path => $ng_conf_d_dir, # path => $ng_conf_d_dir,
owner => 'root', # owner => 'root',
group => $ng_user, # group => $ng_user,
mode => '0750', # mode => '0750',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_etc_t, # seltype => nagios_etc_t,
seluser => system_u, # seluser => system_u,
} # }
# /etc/nagios/objects # /etc/nagios/objects
file { $ng_objects_dir: # file { $ng_objects_dir:
ensure => directory, # ensure => directory,
path => $ng_objects_dir, # path => $ng_objects_dir,
owner => 'root', # owner => 'root',
group => $ng_user, # group => $ng_user,
mode => '0750', # mode => '0750',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_etc_t, # seltype => nagios_etc_t,
seluser => system_u, # seluser => system_u,
} # }
# /etc/nagios/private # /etc/nagios/private
file { $ng_private_dir: # file { $ng_private_dir:
ensure => directory, # ensure => directory,
path => $ng_private_dir, # path => $ng_private_dir,
owner => 'root', # owner => 'root',
group => $ng_user, # group => $ng_user,
mode => '0750', # mode => '0750',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_etc_t, # seltype => nagios_etc_t,
seluser => system_u, # seluser => system_u,
} # }
# include dir # include dir
file { $ng_usr_incl: # file { $ng_usr_incl:
ensure => directory, # ensure => directory,
path => $ng_usr_incl, # path => $ng_usr_incl,
owner => 'root', # owner => 'root',
group => 'root', # group => 'root',
mode => '0755', # mode => '0755',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => usr_t, # seltype => usr_t,
seluser => system_u, # seluser => system_u,
} # }
# log dir # log dir
file { $ng_log_dir: # file { $ng_log_dir:
ensure => directory, # ensure => directory,
path => $ng_log_dir, # path => $ng_log_dir,
owner => $ng_user, # owner => $ng_user,
group => $ng_user, # group => $ng_user,
mode => '0750', # mode => '0750',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_log_t, # seltype => nagios_log_t,
seluser => system_u, # seluser => system_u,
} # }
# log archives # log archives
file { $ng_log_archives: # file { $ng_log_archives:
ensure => directory, # ensure => directory,
path => $ng_log_archives, # path => $ng_log_archives,
owner => $ng_user, # owner => $ng_user,
group => $ng_user, # group => $ng_user,
mode => '0750', # mode => '0750',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_log_t, # seltype => nagios_log_t,
seluser => system_u, # seluser => system_u,
} # }
# /usr/share/nagios # /usr/share/nagios
file { $ng_usr_share: # file { $ng_usr_share:
ensure => directory, # ensure => directory,
path => $ng_usr_share, # path => $ng_usr_share,
owner => 'root', # owner => 'root',
group => 'root', # group => 'root',
mode => '0755', # mode => '0755',
selrange => s0, # selrange => s0#,
selrole => object_r, # selrole => object_r,
seltype => usr_t, # seltype => usr_t,
seluser => system_u, # seluser => system_u,
} # }
# /usr/share/nagios/html # /usr/share/nagios/html
file { $ng_share_html: # file { $ng_share_html:
ensure => directory, # ensure => directory,
path => $ng_share_html, # path => $ng_share_html,
owner => 'root', # owner => 'root',
group => 'root', # group => 'root',
mode => '0755', # mode => '0755',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => usr_t, # seltype => usr_t,
seluser => system_u, # seluser => system_u,
} # }
# run dir for pid file # run dir for pid file
file { $ng_run_dir: # file { $ng_run_dir:
ensure => directory, # ensure => directory,
path => $ng_run_dir, # path => $ng_run_dir,
owner => 'nagios', # owner => 'nagios',
group => 'nagios', # group => 'nagios',
mode => '0750', # mode => '0750',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_var_run_t, # seltype => nagios_var_run_t,
seluser => system_u, # seluser => system_u,
} # }
# cmd dir # cmd dir
file { $ng_cmd_dir: # file { $ng_cmd_dir:
ensure => directory, # ensure => directory,
path => $ng_cmd_dir, # path => $ng_cmd_dir,
owner => 'nagios', # owner => 'nagios',
group => 'nagios', # group => 'nagios',
mode => '0775', # mode => '0775',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_spool_t, # seltype => nagios_spool_t,
seluser => system_u, # seluser => system_u,
} # }
# checkresults dir # checkresults dir
file { $ng_checkresults_dir: # file { $ng_checkresults_dir:
ensure => directory, # ensure => directory,
path => $ng_checkresults_dir, # path => $ng_checkresults_dir,
owner => 'nagios', # owner => 'nagios',
group => 'nagios', # group => 'nagios',
mode => '0770', # mode => '0770',
selrange => s0, # selrange => s0,
selrole => object_r, # selrole => object_r,
seltype => nagios_spool_t, # seltype => nagios_spool_t,
seluser => system_u, # seluser => system_u,
} # }
} # }
}</pre> }</pre>
</td> </td>
</tr> </tr>

File diff suppressed because it is too large Load Diff

View File

@@ -124,16 +124,16 @@ class confdroid_nagios::server::files (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
require confdroid_nagios::main::dirs require confdroid_nagios::main::dirs
if $ng_nagios_server == $fqdn { # if $ng_nagios_server == $fqdn {
file { $ng_nagios_cfg_file: # file { $ng_nagios_cfg_file:
ensure =&gt; file, # ensure =&gt; file,
owner =&gt; $ng_user, # owner =&gt; $ng_user,
group =&gt; $ng_user, # group =&gt; $ng_user,
mode =&gt; &#39;0644&#39;, # mode =&gt; &#39;0644&#39;,
content =&gt; template($ng_nagios_cfg_erb), # content =&gt; template($ng_nagios_cfg_erb),
notify =&gt; Service[$ng_nagios_service], # notify =&gt; Service[$ng_nagios_service],
} # }
} # }
}</pre> }</pre>
</td> </td>
</tr> </tr>

View File

@@ -123,15 +123,15 @@ class confdroid_nagios::server::service (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
require confdroid_nagios::server::files require confdroid_nagios::server::files
if $ng_nagios_server == $fqdn { # if $ng_nagios_server == $fqdn {
service { $ng_nagios_service: # service { $ng_nagios_service:
ensure =&gt; running, # ensure =&gt; running,
name =&gt; $ng_nagios_service, # name =&gt; $ng_nagios_service,
enable =&gt; true, # enable =&gt; true,
hasrestart =&gt; true, # hasrestart =&gt; true,
hasstatus =&gt; true, # hasstatus =&gt; true,
} # }
} # }
}</pre> }</pre>
</td> </td>
</tr> </tr>