Recommit for updates in build 25

This commit is contained in:
Jenkins Server
2026-09-07 16:44:50 +02:00
parent 702b868d0e
commit e65e3bb3af
8 changed files with 299 additions and 16 deletions

View File

@@ -85,6 +85,8 @@
<span class='object_link'><a href="confdroid_puppet_3A_3Afirewall_3A_3Aiptables.html" title="puppet_classes::confdroid_puppet::firewall::iptables (puppet_class)">confdroid_puppet::firewall::iptables</a></span><br/>
<span class='object_link'><a href="confdroid_puppet_3A_3Amonitoring_3A_3Atarget.html" title="puppet_classes::confdroid_puppet::monitoring::target (puppet_class)">confdroid_puppet::monitoring::target</a></span><br/>
</dd>
</dl>
@@ -1194,6 +1196,73 @@
</li>
<li>
<span class='name'>pt_manage_nagios</span>
<span class='type'>(<tt>Boolean</tt>)</span>
<em class="default">(defaults to: <tt>false</tt>)</em>
&mdash;
<div class='inline'>
<p>whether to manage nagios settings</p>
</div>
</li>
<li>
<span class='name'>pt_target_service</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;/etc/nagios/conf.d/puppet_service.cfg&#39;</tt>)</em>
&mdash;
<div class='inline'>
<p>the nagios service config file</p>
</div>
</li>
<li>
<span class='name'>pt_target_contacts</span>
<span class='type'>(<tt>Array</tt>)</span>
<em class="default">(defaults to: <tt>[&#39;nagiosadmin&#39;]</tt>)</em>
&mdash;
<div class='inline'>
<p>the nagios contacts to notify</p>
</div>
</li>
<li>
<span class='name'>pt_procs_allowed</span>
<span class='type'>(<tt>String</tt>)</span>
<em class="default">(defaults to: <tt>&#39;1:&#39;</tt>)</em>
</li>
</ul>
@@ -1205,9 +1274,6 @@
<pre class="lines">
69
70
71
72
73
74
@@ -1359,10 +1425,19 @@
220
221
222
223</pre>
223
224
225
226
227
228
229
230
231
232</pre>
</td>
<td>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 69</span>
<pre class="code"><span class="info file"># File 'manifests/params.pp', line 72</span>
class confdroid_puppet::params (
@@ -1439,6 +1514,12 @@ class confdroid_puppet::params (
String $pt_r10k_basedir = &#39;/etc/puppetlabs/code/environments&#39;,
String $pt_r10k_webhook_port = &#39;8085&#39;,
# nagios
Boolean $pt_manage_nagios = false,
String $pt_target_service = &#39;/etc/nagios/conf.d/puppet_service.cfg&#39;,
Array $pt_target_contacts = [&#39;nagiosadmin&#39;],
String $pt_procs_allowed = &#39;1:&#39;
) {
# facts
$fqdn = $facts[&#39;networking&#39;][&#39;fqdn&#39;]