Recommit for updates in build 156

This commit is contained in:
Jenkins Server
2026-03-07 15:41:09 +01:00
parent 291fcf50b8
commit 461cb526c3
2 changed files with 352 additions and 71 deletions

View File

@@ -120,7 +120,7 @@ inherited by all classes except defines.
<div class="docstring"> <div class="docstring">
<div class="discussion"> <div class="discussion">
<p>confdroid_nagios::params Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com)</p> <p>confdroid_nagios::params Module name: confdroid_nagios Author: 12ww1160 (12ww1160@confdroid.com) @param [String] ng_use_ssl_auth Whether to use SSL authentication in Nagios. Default is 0. @param [String] ng_sysinfo_auth Additional username for the sysinfo authentication in Nagios. Choose a suitable value or leave empty</p>
</div> </div>
</div> </div>
@@ -589,8 +589,6 @@ inherited by all classes except defines.
<span class='type'>(<tt>String</tt>)</span> <span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
&mdash; &mdash;
<div class='inline'> <div class='inline'>
@@ -3137,6 +3135,261 @@ inherited by all classes except defines.
</li> </li>
<li>
<span class='name'>ng_context_help</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to enable context-sensitive help in Nagios. Default is 1.</p>
</div>
</li>
<li>
<span class='name'>ng_pending_states</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to use pending states in Nagios. Default is 1.</p>
</div>
</li>
<li>
<span class='name'>ng_use_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to use authentication in Nagios. Default is 1.</p>
</div>
</li>
<li>
<span class='name'>ng_enable_def_user</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to enable the default user in Nagios. Default is false.</p>
</div>
</li>
<li>
<span class='name'>ng_def_user_name</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;ChangeME&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The name of the default user in Nagios. Change to a suitable value.</p>
</div>
</li>
<li>
<span class='name'>ng_confinfo_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Additional username for the confinfo authentication in Nagios. Choose a suitable value or leave empty</p>
</div>
</li>
<li>
<span class='name'>ng_command_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Additional username for the command authentication in Nagios. Choose a suitable value or leave empty</p>
</div>
</li>
<li>
<span class='name'>ng_hostview_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Additional username for the host view authentication in Nagios. Choose a suitable value or leave empty</p>
</div>
</li>
<li>
<span class='name'>ng_serviceview_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Additional username for the service view authentication in Nagios. Choose a suitable value or leave empty</p>
</div>
</li>
<li>
<span class='name'>ng_host_cmd_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Additional username for the host command authentication in Nagios. Choose a suitable value or leave empty</p>
</div>
</li>
<li>
<span class='name'>ng_svc_cmd_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Additional username for the service command authentication in Nagios. Choose a suitable value or leave empty</p>
</div>
</li>
<li>
<span class='name'>ng_readonly_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>Additional username for the read-only authentication in Nagios. Choose a suitable value or leave empty</p>
</div>
</li>
<li>
<span class='name'>ng_use_ssl_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;0&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_sysinfo_auth</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;&#39;</tt>)</em>
</li>
<li>
<span class='name'>ng_procs_tot_ensure</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;present&#39;</tt>)</em>
</li>
</ul> </ul>
@@ -3148,34 +3401,6 @@ inherited by all classes except defines.
<pre class="lines"> <pre class="lines">
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368 368
369 369
370 370
@@ -3447,10 +3672,52 @@ inherited by all classes except defines.
636 636
637 637
638 638
639</pre> 639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 340</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 368</span>
class confdroid_nagios::params ( class confdroid_nagios::params (
@@ -3607,6 +3874,20 @@ class confdroid_nagios::params (
# cgi.cfg # cgi.cfg
String $ng_context_help = &#39;1&#39;, String $ng_context_help = &#39;1&#39;,
String $ng_pending_states = &#39;1&#39;,
String $ng_use_auth = &#39;1&#39;,
String $ng_use_ssl_auth = &#39;0&#39;,
Boolean $ng_enable_def_user = false,
String $ng_def_user_name = &#39;ChangeME&#39;,
String $ng_sysinfo_auth = &#39;&#39;,
String $ng_confinfo_auth = &#39;&#39;,
String $ng_command_auth = &#39;&#39;,
String $ng_hostview_auth = &#39;&#39;,
String $ng_serviceview_auth = &#39;&#39;,
String $ng_host_cmd_auth = &#39;&#39;,
String $ng_svc_cmd_auth = &#39;&#39;,
String $ng_readonly_auth = &#39;&#39; ,
# httpd # httpd
Boolean $ng_use_https = false, Boolean $ng_use_https = false,
@@ -3632,7 +3913,7 @@ class confdroid_nagios::params (
String $ng_procs_tot_warn = &#39;330&#39;, String $ng_procs_tot_warn = &#39;330&#39;,
String $ng_procs_tot_crit = &#39;400&#39;, String $ng_procs_tot_crit = &#39;400&#39;,
String $ng_procs_tot_param = &#39;RDST&#39;, String $ng_procs_tot_param = &#39;RDST&#39;,
String $ng_procs_tot_ens = &#39;present&#39;, String $ng_procs_tot_ensure = &#39;present&#39;,
# zombie procs # zombie procs
String $ng_procs_z_warn = &#39;10&#39;, String $ng_procs_z_warn = &#39;10&#39;,
String $ng_procs_z_crit = &#39;30&#39;, String $ng_procs_z_crit = &#39;30&#39;,

View File

@@ -166,18 +166,18 @@ class confdroid_nagios::server::files (
notify =&gt; Service[$ng_service], notify =&gt; Service[$ng_service],
} }
# file { $ng_cgi_cfg_file: file { $ng_cgi_cfg_file:
# ensure =&gt; file, ensure =&gt; file,
# owner =&gt; &#39;nagios&#39;, owner =&gt; &#39;nagios&#39;,
# group =&gt; &#39;nagios&#39;, group =&gt; &#39;nagios&#39;,
# mode =&gt; &#39;0644&#39;, mode =&gt; &#39;0644&#39;,
# selrange =&gt; s0, selrange =&gt; s0,
# selrole =&gt; object_r, selrole =&gt; object_r,
# seltype =&gt; nagios_etc_t, seltype =&gt; nagios_etc_t,
# seluser =&gt; system_u, seluser =&gt; system_u,
# content =&gt; template($ng_nagios_cgi_cfg_erb), content =&gt; template($ng_nagios_cgi_cfg_erb),
# notify =&gt; Service[$ng_service], notify =&gt; Service[$ng_service],
# } }
file { $ng_lock_file: file { $ng_lock_file:
ensure =&gt; file, ensure =&gt; file,