Compare commits

1 Commits

Author SHA1 Message Date
Jenkins
e5bc5d88c7 Merge branch 'jenkins-build-245' into 'master'
Auto-merge for build 245

See merge request puppet/confdroid_nagios!10
2026-09-27 14:08:00 +02:00
5 changed files with 4 additions and 34 deletions

View File

@@ -340,7 +340,7 @@ All files and directories are configured with correct selinux context. If selinu
## Support ## Support
- OS: Rocky 9 - OS: Rocky 9
- Puppet 7 # Puppet themselves does not support Nagios in Puppet 8 anymore, although it still works - Puppet 7 # Puppet does not support Nagios in Puppet 8 anymore, although it still works
## Tests ## Tests

View File

@@ -449,7 +449,7 @@ Re-type new password:
<ul><li> <ul><li>
<p>OS: Rocky 9</p> <p>OS: Rocky 9</p>
</li><li> </li><li>
<p>Puppet 7 # Puppet themselves does not support Nagios in Puppet 8 anymore, although it still works</p> <p>Puppet 7 # Puppet does not support Nagios in Puppet 8 anymore, although it still works</p>
</li></ul> </li></ul>
<h2 id="label-Tests">Tests</h2> <h2 id="label-Tests">Tests</h2>

View File

@@ -449,7 +449,7 @@ Re-type new password:
<ul><li> <ul><li>
<p>OS: Rocky 9</p> <p>OS: Rocky 9</p>
</li><li> </li><li>
<p>Puppet 7 # Puppet themselves does not support Nagios in Puppet 8 anymore, although it still works</p> <p>Puppet 7 # Puppet does not support Nagios in Puppet 8 anymore, although it still works</p>
</li></ul> </li></ul>
<h2 id="label-Tests">Tests</h2> <h2 id="label-Tests">Tests</h2>

View File

@@ -374,17 +374,7 @@ and populates /etc/nagios/conf.d/nagios_commands.cfg.
279 279
280 280
281 281
282 282</pre>
283
284
285
286
287
288
289
290
291
292</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span> <pre class="code"><span class="info file"># File 'manifests/nagios/objects/commands.pp', line 8</span>
@@ -662,16 +652,6 @@ class confdroid_nagios::nagios::objects::commands (
mode =&gt; &#39;0640&#39;, mode =&gt; &#39;0640&#39;,
target =&gt; $ng_target_command, target =&gt; $ng_target_command,
} }
@@nagios_command { &#39;check_chronyd&#39;:
ensure =&gt; present,
command_name =&gt; &#39;check_chronyd&#39;,
command_line =&gt; &#39;$USER1$/check_procs -c $ARG1$ -C $ARG2$&#39;,
owner =&gt; $ng_user,
group =&gt; $ng_user,
mode =&gt; &#39;0640&#39;,
target =&gt; $ng_target_command,
}
} }
}</pre> }</pre>
</td> </td>

View File

@@ -278,15 +278,5 @@ class confdroid_nagios::nagios::objects::commands (
mode => '0640', mode => '0640',
target => $ng_target_command, target => $ng_target_command,
} }
@@nagios_command { 'check_chronyd':
ensure => present,
command_name => 'check_chronyd',
command_line => '$USER1$/check_procs -c $ARG1$ -C $ARG2$',
owner => $ng_user,
group => $ng_user,
mode => '0640',
target => $ng_target_command,
}
} }
} }