Merge build 42 into master

This commit is contained in:
Jenkins Server
2026-09-24 16:46:06 +02:00
5 changed files with 11 additions and 6 deletions

View File

@@ -29,6 +29,7 @@
- manage required files and directories including selinux context - manage required files and directories including selinux context
- manage service - manage service
- (optional) manage firewall - (optional) manage firewall
- (optional) manage nagios monitoring for `sshd`
## Adding custom configurations ## Adding custom configurations

View File

@@ -104,6 +104,8 @@
<p>manage service</p> <p>manage service</p>
</li><li> </li><li>
<p>(optional) manage firewall</p> <p>(optional) manage firewall</p>
</li><li>
<p>(optional) manage nagios monitoring for <code>sshd</code></p>
</li></ul> </li></ul>
<h2 id="label-Adding+custom+configurations">Adding custom configurations</h2> <h2 id="label-Adding+custom+configurations">Adding custom configurations</h2>

View File

@@ -104,6 +104,8 @@
<p>manage service</p> <p>manage service</p>
</li><li> </li><li>
<p>(optional) manage firewall</p> <p>(optional) manage firewall</p>
</li><li>
<p>(optional) manage nagios monitoring for <code>sshd</code></p>
</li></ul> </li></ul>
<h2 id="label-Adding+custom+configurations">Adding custom configurations</h2> <h2 id="label-Adding+custom+configurations">Adding custom configurations</h2>

View File

@@ -125,12 +125,12 @@
class confdroid_ssh::monitoring::target ( class confdroid_ssh::monitoring::target (
) inherits confdroid_ssh::params { ) inherits confdroid_ssh::params {
if $ssh_manage_nagios == true { if $ssh_manage_nagios == true {
@@nagios_service { &quot;check_ssh_${fqdn}&quot;: @@nagios_service { &quot;check_sshd_${fqdn}&quot;:
check_command =&gt; &quot;check_nrpe!check_ssh!${ssh_procs_allowed}!sshd&quot;, check_command =&gt; &quot;check_nrpe!check_sshd!${ssh_procs_allowed}!sshd&quot;,
use =&gt; &#39;generic-service&#39;, use =&gt; &#39;generic-service&#39;,
host_name =&gt; $fqdn, host_name =&gt; $fqdn,
notification_period =&gt; &#39;24x7&#39;, notification_period =&gt; &#39;24x7&#39;,
service_description =&gt; &quot;${fqdn}_check_ssh&quot;, service_description =&gt; &quot;${fqdn}_check_sshd&quot;,
target =&gt; $ssh_target_service, target =&gt; $ssh_target_service,
owner =&gt; &#39;nagios&#39;, owner =&gt; &#39;nagios&#39;,
group =&gt; &#39;nagios&#39;, group =&gt; &#39;nagios&#39;,

View File

@@ -6,12 +6,12 @@
class confdroid_ssh::monitoring::target ( class confdroid_ssh::monitoring::target (
) inherits confdroid_ssh::params { ) inherits confdroid_ssh::params {
if $ssh_manage_nagios == true { if $ssh_manage_nagios == true {
@@nagios_service { "check_ssh_${fqdn}": @@nagios_service { "check_sshd_${fqdn}":
check_command => "check_nrpe!check_ssh!${ssh_procs_allowed}!sshd", check_command => "check_nrpe!check_sshd!${ssh_procs_allowed}!sshd",
use => 'generic-service', use => 'generic-service',
host_name => $fqdn, host_name => $fqdn,
notification_period => '24x7', notification_period => '24x7',
service_description => "${fqdn}_check_ssh", service_description => "${fqdn}_check_sshd",
target => $ssh_target_service, target => $ssh_target_service,
owner => 'nagios', owner => 'nagios',
group => 'nagios', group => 'nagios',