Recommit for updates in build 16

This commit is contained in:
Jenkins Server
2026-02-13 15:28:25 +01:00
parent 728ac0a7ab
commit 8a5049528d

View File

@@ -129,7 +129,8 @@
31 31
32 32
33 33
34</pre> 34
35</pre>
</td> </td>
<td> <td>
<pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span> <pre class="code"><span class="info file"># File 'manifests/main/install.pp', line 6</span>
@@ -137,8 +138,9 @@
class confdroid_nagios::main::install ( class confdroid_nagios::main::install (
) inherits confdroid_nagios::params { ) inherits confdroid_nagios::params {
require confdroid_resources
if $ng_nagios_server == $fqdn { if $ng_nagios_server == $fqdn {
require confdroid_resources
# if our FQDN matches the configured Nagios server FQDN, install both server- # if our FQDN matches the configured Nagios server FQDN, install both server-
# and client packages.We&#39;ll need httpd installed # and client packages.We&#39;ll need httpd installed
require confdroid_apache require confdroid_apache
@@ -153,8 +155,8 @@ class confdroid_nagios::main::install (
# if we are not the nagios server, install only client packages # if we are not the nagios server, install only client packages
if $fqdn != $ng_nagios_server { if $fqdn != $ng_nagios_server {
package { $reqpackages_client: package { $ng_reqpackages_client:
ensure =&gt; $pkg_ensure, ensure =&gt; $ng_pkg_ensure,
} }
# if we want to use NRPE on clients, install it # if we want to use NRPE on clients, install it