From ce32e10357d723984fa15839638cf626c1d8eb7b Mon Sep 17 00:00:00 2001 From: Jenkins Server Date: Mon, 9 Mar 2026 16:02:52 +0100 Subject: [PATCH] Recommit for updates in build 196 --- ...confdroid_nagios_3A_3Aclient_3A_3Atarget.html | 12 +++++++++++- .../confdroid_nagios_3A_3Amain_3A_3Ainstall.html | 16 +++++++--------- ...confdroid_nagios_3A_3Aserver_3A_3Anagios.html | 4 +--- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html index b675858..1381c77 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aclient_3A_3Atarget.html @@ -218,7 +218,12 @@ 120 121 122 -123 +123 +124 +125 +126 +127 +128
# File 'manifests/client/target.pp', line 6
@@ -231,6 +236,11 @@ class confdroid_nagios::client::target (
       ensure => $ng_pkg_ensure,
     }
 
+    # if we want to use NRPE on clients, install it
+    if $ng_include_nrpe == true {
+      require confdroid_nrpe
+    }
+
     @@nagios_host { $fqdn:
       ensure              => $ng_ping_ensure,
       alias               => $hostname,
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html
index b89aeb8..ee2a1f5 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Amain_3A_3Ainstall.html
@@ -123,8 +123,7 @@
 25
 26
 27
-28
-29
+28
# File 'manifests/main/install.pp', line 6
@@ -142,15 +141,14 @@ class confdroid_nagios::main::install (
     package { $ng_reqpackages_server:
       ensure => $ng_pkg_ensure,
     }
-  }
 
-  package { $ng_reqpackages_client:
-    ensure => $ng_pkg_ensure,
-  }
+    package { $ng_reqpackages_client:
+      ensure => $ng_pkg_ensure,
+    }
 
-  # if we want to use NRPE on clients, install it
-  if $ng_include_nrpe == true {
-    require confdroid_nrpe
+    if $ng_include_nrpe == true {
+      require confdroid_nrpe
+    }
   }
 }
diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html index e32c7c1..bccb39d 100644 --- a/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html +++ b/doc/puppet_classes/confdroid_nagios_3A_3Aserver_3A_3Anagios.html @@ -217,8 +217,7 @@ 119 120 121 -122 -123 +122
# File 'manifests/server/nagios.pp', line 6
@@ -227,7 +226,6 @@ class confdroid_nagios::server::nagios (
 
 ) inherits confdroid_nagios::params {
   if $ng_nagios_server == $fqdn {
-
     @@nagios_service { 'check_nagios_localhost':
       check_command       => "check_nagios!${ng_spool_dir}/status.dat!5!/usr/sbin/nagios",
       use                 => 'generic-service',