Recommit for updates in build 226

This commit is contained in:
Jenkins Server
2026-03-12 15:31:34 +01:00
parent 8a8aab3f1f
commit 2da958fe0b
2 changed files with 79 additions and 7 deletions

View File

@@ -4075,6 +4075,42 @@ inherited by all classes except defines.
</li> </li>
<li>
<span class='name'>ng_use_lb</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>Whether to use load balancing for the Nagios server. Default is false.</p>
</div>
</li>
<li>
<span class='name'>ng_trusted_proxy</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;10.0.0.10&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>The IP address of the trusted proxy to access the Nagios server. Default is 10.0.0.10.</p>
</div>
</li>
<li> <li>
<span class='name'>ng_use_ssl_auth</span> <span class='name'>ng_use_ssl_auth</span>
@@ -4099,10 +4135,6 @@ inherited by all classes except defines.
<pre class="lines"> <pre class="lines">
445
446
447
448
449 449
450 450
451 451
@@ -4443,10 +4475,17 @@ inherited by all classes except defines.
786 786
787 787
788 788
789</pre> 789
790
791
792
793
794
795
796</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 445</span> <pre class="code"><span class="info file"># File 'manifests/params.pp', line 449</span>
class confdroid_nagios::params ( class confdroid_nagios::params (
@@ -4464,6 +4503,8 @@ class confdroid_nagios::params (
String $ng_user = &#39;nagios&#39;, String $ng_user = &#39;nagios&#39;,
Boolean $ng_enable_target = true, Boolean $ng_enable_target = true,
Boolean $ng_purge_target = true, Boolean $ng_purge_target = true,
Boolean $ng_use_lb = false,
String $ng_trusted_proxy = &#39;10.0.0.10&#39;,
# contact groups # contact groups
String $ng_contactgroup_name = &#39;admins&#39;, String $ng_contactgroup_name = &#39;admins&#39;,
@@ -4734,6 +4775,7 @@ class confdroid_nagios::params (
$ng_nagios_cfg_erb = &#39;confdroid_nagios/nagios/nagios_cfg.erb&#39; $ng_nagios_cfg_erb = &#39;confdroid_nagios/nagios/nagios_cfg.erb&#39;
$ng_cgi_cfg_file = &quot;${ng_main_dir}/cgi.cfg&quot; $ng_cgi_cfg_file = &quot;${ng_main_dir}/cgi.cfg&quot;
$ng_cgi_cfg_erb = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39; $ng_cgi_cfg_erb = &#39;confdroid_nagios/nagios/cgi_cfg.erb&#39;
$ng_remoteip_file = &#39;/etc/httpd/conf.d/loadbalancer-remoteip.conf&#39;
# nagios # nagios
$ng_target_templates = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot; $ng_target_templates = &quot;${ng_conf_d_dir}/nagios_templates.cfg&quot;

View File

@@ -143,7 +143,22 @@
45 45
46 46
47 47
48</pre> 48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/server/files.pp', line 6</span>
@@ -189,6 +204,21 @@ class confdroid_nagios::server::files (
seltype =&gt; nagios_var_run_t, seltype =&gt; nagios_var_run_t,
seluser =&gt; system_u, seluser =&gt; system_u,
} }
if $ng_use_lb == true {
file { $ng_remoteip_file:
ensure =&gt; file,
owner =&gt; &#39;root&#39;,
group =&gt; &#39;root&#39;,
mode =&gt; &#39;0644&#39;,
selrange =&gt; s0,
selrole =&gt; object_r,
seltype =&gt; httpd_conf_t,
seluser =&gt; system_u,
content =&gt; template(&#39;confdroid_nagios/loadbalancer/remoteip.conf.erb&#39;),
notify =&gt; Service[&#39;httpd&#39;],
}
}
} }
}</pre> }</pre>
</td> </td>